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
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"
#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
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 \
development/lyx.spec \
lib/Makefile \
lib/doc/Makefile \
+ lib/lyx2lyx/lyx2lyx_version.py \
lib/lyx2lyx/Makefile \
intl/Makefile \
po/Makefile.in \
src/frontends/qt4/ui/Makefile \
])
echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
-(cd lib && python $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