Do not use tr1 with libc++

[features.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e05681c49d3ffb7e960d7cec18c3eff1f20bd152..1cbb6bd978ab9d175a66f4aa29e2ed5d9c78588a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8] LYX_OBJECTS_LAYOUT)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE
 
-LYX_CHECK_GIT_COMMIT
-
 # Allow to build some parts of the code as one big chunk
 m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt])
 AC_ARG_ENABLE(monolithic-build,
@@ -287,8 +285,9 @@ char * strerror(int n);
 #define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 // TR1 regex not supported in GCC <= 4.5
+// clang defines __GNUC__ but libc++ does not have tr1
 #ifndef LYX_USE_TR1
-#  if __GNUC__ == 4 
+#  if __GNUC__ == 4 && !defined(USE_LLVM_LIBCPP)
 #    define LYX_USE_TR1
 #  endif
 #endif
@@ -327,7 +326,6 @@ AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX],
        "${version_suffix}",[Program version suffix])
 
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
-AC_DEFINE_UNQUOTED([LYX_GIT_COMMIT_HASH], "$lyxgitcommit", [Git commit])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
 AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir])
 AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir])