X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=db689d8fae088c029939851b3731b2da2d6837cc;hb=568ae274e5fe2bdb2a11a7d5763a7398e9e6f11d;hp=cdb0941a9e1c194f5976bd519363c9e13176f607;hpb=eef5f997f18822b0c6aa92c34543a74dc8ad0450;p=lyx.git diff --git a/configure.ac b/configure.ac index cdb0941a9e..db689d8fae 100644 --- 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} @@ -38,6 +30,9 @@ done ### Check for programs AC_PROG_MAKE_SET AC_PROG_INSTALL + +AC_SUBST(AWK,[gawk]) + #AC_PROG_RANLIB AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :) if test "x$KPSEWHICH" = xkpsewhich ; then @@ -46,6 +41,9 @@ if test "x$KPSEWHICH" = xkpsewhich ; then fi AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) +# Check for installed python +AM_PATH_PYTHON(1.5.2,, :) + # Work around a problem in automake 1.4: when invoking install-strip, # INSTALL_PROGRAM is changed to 'install -s', and since # INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0 @@ -70,7 +68,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 @@ -87,7 +84,7 @@ AC_ARG_ENABLE(assertions, enable_assertions=no; fi;]) if test "x$enable_assertions" = xyes ; then - lyx_flags="$lyx_flags assertions" + lyx_flags="assertions $lyx_flags" AC_DEFINE(ENABLE_ASSERTIONS,1, [Define if you want assertions to be enabled in the code]) fi @@ -120,8 +117,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="aiksaurus $lyx_flags" + ]) AC_CHECK_HEADER(Aiksaurus.h,[ ac_cv_header_aiksaurus_h=yes lyx_cv_aiksaurus_h_location=""]) @@ -140,12 +138,6 @@ AC_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL LYX_PROG_LIBTOOL -### Check if we want spell libraries, prefer new aspell -CHECK_WITH_ASPELL -if test "$USING_ASPELL" != "yes"; then - CHECK_WITH_PSPELL -fi - ### Check for some Cygwin-specific details. CHECK_WITH_CYGWIN @@ -165,7 +157,8 @@ 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" + noxformsbin=yes fi dnl The code below is not in a macro, because this would cause big @@ -174,7 +167,9 @@ for frontend in $FRONTENDS ; do case "$frontend" in xforms) XFORMS_DO_IT_ALL - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" + if test -z "$noxformsbin" ; then + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" + fi FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms" RPM_FRONTEND="xforms" FRONTEND_INFO="${FRONTEND_INFO}\ @@ -228,27 +223,29 @@ 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 AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h) # some standard structures AC_HEADER_STAT @@ -280,8 +277,8 @@ 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.]) - lyx_flags="$lyx_flags compression" + AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.]) + lyx_flags="compression $lyx_flags" fi fi AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue) @@ -294,9 +291,18 @@ 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(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink) +AC_LANG_POP(C) + +LYX_CHECK_SPELL_ENGINES + +lyx_client_subdir=true +AC_LANG_PUSH(C) +AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false]) +AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir) AC_LANG_POP(C) + AC_FUNC_SELECT_ARGTYPES ### Some information on what just happened @@ -304,19 +310,27 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` VERSION_INFO="Configuration\n\ Host type: ${host}\n\ - Special build flags: ${lyx_flags}\n\ - C Compiler: ${CC}\n\ - C Compiler flags: ${CFLAGS}\n\ + Special build flags: ${lyx_flags}\n\ + C Compiler: ${CC} ${CC_VERSION}\n\ + C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ + C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ - C++ Compiler flags: ${CXXFLAGS}\n\ - Linker flags: ${LDFLAGS}\n\ + C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ + C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ + Linker flags: ${AM_LDFLAGS}\n\ + Linker user flags: ${LDFLAGS}\n\ ${FRONTEND_INFO}\ + Packaging: ${lyx_use_packaging}\n\ LyX binary dir: ${real_bindir}\n\ LyX files dir: ${real_datadir}\n" AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) +AC_SUBST(AM_CPPFLAGS) +AC_SUBST(AM_CXXFLAGS) +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_LDFLAGS) ## Some config.h stuff @@ -379,11 +393,15 @@ int mkstemp(char*); #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 +#ifdef __CYGWIN__ +#define BOOST_POSIX 1 +#endif + #endif ]) ### Finish the work. -AC_CONFIG_SUBDIRS(lib lib/reLyX) +AC_CONFIG_SUBDIRS(lib) AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ @@ -398,6 +416,7 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ development/lyx.spec \ lib/Makefile \ lib/doc/Makefile \ + lib/lyx2lyx/Makefile \ intl/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \ @@ -410,6 +429,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 +443,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