* Add the iostreams and range libs to our copy of boost

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bc80ec095eefd0fec3f6e0b4c2ffe0e2b3911fdd..f121cdec170e2cdc5b9311cd192f5570fca963c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ LYX_VERSION_SUFFIX
 AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
 # We need to define these variables here and the no-define option of
-# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. 
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
 dnl default maintainer mode to true for development versions
@@ -28,7 +28,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs lib/configure ; do
+for file in config/install-sh config/mkinstalldirs ; do
   chmod 755 ${srcdir}/${file}
 done
 
@@ -309,9 +309,9 @@ save_LIBS="$LIBS"
 LIBS=
 AC_CHECK_FUNCS(fcntl,
   [AC_SEARCH_LIBS([gethostbyname], [nsl])
-   AC_SEARCH_LIBS([socket], [socket], [], 
+   AC_SEARCH_LIBS([socket], [socket], [],
      [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
-                [], [-lnsl])])], 
+               [], [-lnsl])])],
   [lyx_client_subdir=false])
 AC_SUBST(SOCKET_LIBS,$LIBS)
 LIBS="$save_LIBS"
@@ -394,45 +394,45 @@ int mkstemp(char*);
 #endif
 
 #ifdef __EMX__
-#include "support/os2_defines.h"
+#  include "support/os2_defines.h"
 #endif
 
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
+#  define USE_BOOST_FORMAT 1
 #else
-#define USE_BOOST_FORMAT 0
+#  define USE_BOOST_FORMAT 0
 #endif
 
 #define BOOST_USER_CONFIG <config.h>
 
-#if defined(ENABLE_ASSERTIONS)
-#define BOOST_ENABLE_ASSERT_HANDLER 1
-#else
-#define BOOST_DISABLE_ASSERTS 1
+#if !defined(ENABLE_ASSERTIONS)
+#  define BOOST_DISABLE_ASSERTS 1
 #endif
+#define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
-#define BOOST_POSIX 1
+#  define BOOST_POSIX 1
 #endif
 
 #if defined(HAVE_NEWAPIS_H)
-#define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
 #endif
 ])
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib)
 AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/Makefile \
        boost/libs/Makefile \
        boost/libs/filesystem/Makefile \
        boost/libs/filesystem/src/Makefile \
+       boost/libs/iostreams/Makefile \
+       boost/libs/iostreams/src/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
        boost/libs/signals/Makefile \
@@ -442,6 +442,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        development/lyx.spec \
        lib/Makefile \
        lib/doc/Makefile \
+       lib/lyx2lyx/lyx2lyx_version.py \
        lib/lyx2lyx/Makefile \
        intl/Makefile \
        po/Makefile.in \
@@ -474,6 +475,8 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt4/moc/Makefile \
        src/frontends/qt4/ui/Makefile \
 ])
+echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
+(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix")
 
 AC_OUTPUT
 # show version information