Compile fix.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9ae83b7af5d5dce13f7a469d74bd64149d13efb7..639066417dd315ab59e5ac1a05b082128db85c75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
 LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
@@ -76,6 +74,19 @@ dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
+###
+AC_ARG_WITH(included-string,
+    AC_HELP_STRING([--with-included-string],[use std::string through namespace lyx]),
+       [lyx_cv_with_included_string=$withval
+       AC_MSG_RESULT([$with_included_string])],
+       [AC_CACHE_CHECK([],lyx_cv_with_included_string,[lyx_cv_with_included_string=no])])
+if test x$lyx_cv_with_included_string = xyes ; then
+    AC_DEFINE(USE_INCLUDED_STRING, 1,
+       [Define to use std::string through namespace lyx.])
+    lyx_flags="$lyx_flags included-string"
+fi
+
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
@@ -173,8 +184,8 @@ for frontend in $FRONTENDS ; do
          RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
-      libXpm version:               ${XPM_VERSION}\n\
-      libforms version:             ${XFORMS_VERSION}\n"
+      libXpm version:\t\t${XPM_VERSION}\n\
+      libforms version:\t\t${XFORMS_VERSION}\n"
          ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -190,15 +201,17 @@ for frontend in $FRONTENDS ; do
   dnl  ;;
     gtk)
          XFORMS_DO_IT_ALL
-         PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
+         PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk"
          RPM_FRONTEND="gtk"
          RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
          LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
-         FRONTEND_INFO="    libgtkmm version:             ${GTKMM_VERSION}\n\
-    libglademm version:           ${LIBGLADEMM_VERSION}\n"
+         FRONTEND_INFO="${FRONTEND_INFO}\
+  GTK Frontend:\n\
+    libgtkmm version:\t\t${GTKMM_VERSION}\n\
+    libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
          ;;
 
     qt)
@@ -209,7 +222,7 @@ for frontend in $FRONTENDS ; do
          RPM_FRONTEND_DEPS='qt >= 2.2.1'
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:                   ${QT_VERSION}\n"
+      Qt version:\t\t${QT_VERSION}\n"
       ;;
     *)
          LYX_ERROR(Unknown frontend '$frontend');;
@@ -371,6 +384,12 @@ int mkstemp(char*);
 #define USE_BOOST_FORMAT 0
 #endif
 
+#if defined(ENABLE_ASSERTIONS)
+#define BOOST_ENABLE_ASSERT_HANDLER 1
+#else
+#define BOOST_DISABLE_ASSERTS 1
+#endif
+
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1