Remove some redundant #includes.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 639066417dd315ab59e5ac1a05b082128db85c75..877902681395b99898bc767991ab1b4385fa5828 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,19 +74,6 @@ 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]),,
@@ -384,6 +371,8 @@ int mkstemp(char*);
 #define USE_BOOST_FORMAT 0
 #endif
 
+#define BOOST_USER_CONFIG <config.h>
+
 #if defined(ENABLE_ASSERTIONS)
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 #else
@@ -402,6 +391,8 @@ AC_CONFIG_SUBDIRS(lib lib/reLyX)
 AC_CONFIG_FILES([Makefile \
        boost/Makefile \
        boost/libs/Makefile \
+       boost/libs/filesystem/Makefile \
+       boost/libs/filesystem/src/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
        boost/libs/signals/Makefile \
@@ -428,6 +419,7 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
        src/frontends/xforms/forms/Makefile \
        src/frontends/gtk/Makefile \
+       src/frontends/gtk/gimages/Makefile \
        src/frontends/gtk/glade/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/qt2/moc/Makefile \