compilation fix

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 62c9db99ae756ff214d9887a8a499f9d9d4446de..af1a2c527354631efaed39ddf77515da81d1b848 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,8 +115,9 @@ 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"
-       ],,"-lbz2")
+        AIKSAURUS_LIBS="-lAiksaurus"
+        lyx_flags="$lyx_flags aiksaurus"
+       ])
 AC_CHECK_HEADER(Aiksaurus.h,[
   ac_cv_header_aiksaurus_h=yes
   lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
@@ -228,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
@@ -281,7 +289,7 @@ if test $use_compression=true ; then
        AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
        AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
        if test $use_compression = true ; then
-               AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to support compressed files.])
+               AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
                lyx_flags="$lyx_flags compression"
        fi
 fi
@@ -381,6 +389,10 @@ int mkstemp(char*);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
 #endif
 ])
 
@@ -412,6 +424,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/graphics/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
+       src/support/tests/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \