Update Bernd Rellermeyer's entry

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cdb0941a9e1c194f5976bd519363c9e13176f607..0983d990c2c7dcdfcdb7ad6fc4374621830c412f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,14 +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"
-
-# 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 +62,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 +111,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>"])
@@ -165,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
@@ -228,21 +220,23 @@ 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)
-# 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
@@ -280,7 +274,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 +288,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 +300,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 +374,10 @@ int mkstemp(char*);
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
 #endif
 ])
 
@@ -410,6 +409,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 \
@@ -423,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