X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=af1a2c527354631efaed39ddf77515da81d1b848;hb=3a4be311e69ad234dad94af3fd41b0287de2a734;hp=cdb0941a9e1c194f5976bd519363c9e13176f607;hpb=eef5f997f18822b0c6aa92c34543a74dc8ad0450;p=lyx.git

diff --git a/configure.ac b/configure.ac
index cdb0941a9e..af1a2c5273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,6 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 # This is needed by GNU gettext
 ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
 
-# fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do
   chmod 755 ${srcdir}/${file}
@@ -70,7 +66,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
@@ -120,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 +224,19 @@ dnl qt build will fail without moc or uic
   esac
 done
 
+### Check how the files should be packaged
+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
 AC_LANG_PUSH(C)
@@ -280,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
@@ -294,7 +303,7 @@ dnl work correctly because of some conflict with stdlib.h with g++ 2.96
 dnl We aim to remove this eventually, since we should test as much as
 dnl possible with the compiler which will use the functions (JMarc)
 AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp)
+AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
 AC_LANG_POP(C)
 
 AC_FUNC_SELECT_ARGTYPES
@@ -306,11 +315,12 @@ VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
   Special build flags:           ${lyx_flags}\n\
   C   Compiler:                   ${CC}\n\
-  C   Compiler flags:             ${CFLAGS}\n\
+  C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\n\
   C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler flags:             ${CXXFLAGS}\n\
+  C++ Compiler flags:             ${CPPFLAGS} ${CXXFLAGS}\n\
   Linker flags:                   ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
+  Packaging:                      ${lyx_use_packaging}\n\
   LyX binary dir:                 ${real_bindir}\n\
   LyX files dir:                  ${real_datadir}\n"
 
@@ -379,6 +389,10 @@ int mkstemp(char*);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
 #endif
 ])
 
@@ -410,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 \