Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ea83e9b0b4076702fbc3d3db410334d958f643f4..c2d5984e6a9101e6b935c8be85e02527d041f2c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -394,33 +394,32 @@ 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
@@ -474,7 +473,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        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