Update Bernd Rellermeyer's entry

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 40dd30e7a07fc18c84344a043c7d60249f1d702f..0983d990c2c7dcdfcdb7ad6fc4374621830c412f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,6 @@ LYX_VERSION_SUFFIX
 
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
-# The list of languages known to LyX
-# 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"
-
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do
   chmod 755 ${srcdir}/${file}
@@ -115,7 +111,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,[
@@ -161,7 +157,7 @@ esac
 
 dnl if the gtk frontend has been specified, then xforms is needed too
 if echo $FRONTENDS | grep gtk | grep -v xforms ; then
-  FRONTENDS="$FRONTENDS xforms"
+  FRONTENDS="xforms $FRONTENDS"
 fi
 
 dnl The code below is not in a macro, because this would cause big
@@ -229,22 +225,18 @@ 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)
-# Some tests that may be useful for gettext
-AC_C_CONST
-AC_C_INLINE
-# Do the real setup now
 AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed
-case  "${XGETTEXT}" in
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
 AC_LANG_POP(C)
 
 # some standard header files
@@ -382,6 +374,10 @@ int mkstemp(char*);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
 #endif
 ])
 
@@ -427,7 +423,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \
        src/frontends/qt2/ui/moc/Makefile \
-       src/frontends/gnome/Makefile \
 ])
 
 AC_OUTPUT