Ensure that "paragraphs().size() - 1" can be used meaningfully in a comparison.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 40dd30e7a07fc18c84344a043c7d60249f1d702f..af1a2c527354631efaed39ddf77515da81d1b848 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AC_ARG_WITH(aiksaurus,
 if test x$lyx_use_aiksaurus != xno; then
 AC_CHECK_LIB(Aiksaurus, main,
        [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
-        AIKSAURUS_LIBS="-lAiksaurus -lbz2"
+        AIKSAURUS_LIBS="-lAiksaurus"
         lyx_flags="$lyx_flags aiksaurus"
        ])
 AC_CHECK_HEADER(Aiksaurus.h,[
@@ -229,6 +229,13 @@ LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+  LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+   causes problems with the Makefiles. The installation will be done in
+   directory \"`pwd`/installprefix\" instead. Please move its contents to
+   the right place after installation.])
+  prefix=`pwd`/installprefix
+fi
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C
@@ -382,6 +389,10 @@ int mkstemp(char*);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
 #endif
 ])