X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=db689d8fae088c029939851b3731b2da2d6837cc;hb=3410c395b58d12f63d7bfaac0e55a7b642e71009;hp=a0f114b98feffc0719f8696efc85740b1f450732;hpb=89c62d06259c6a72e2ee52d56d816e79dff2aa65;p=lyx.git diff --git a/configure.ac b/configure.ac index a0f114b98f..db689d8fae 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ PACKAGE=lyx${program_suffix} VERSION="1.4.0cvs" LYX_CHECK_VERSION +dnl default maintainer mode to true for development versions +if test "${enable_maintainer_mode+set}" != set; then + enable_maintainer_mode=$lyx_devel_version +fi AM_MAINTAINER_MODE AC_CANONICAL_TARGET @@ -18,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} @@ -34,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 @@ -42,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 @@ -56,7 +58,7 @@ AC_ISC_POSIX AC_AIX ### check which frontend we want to use -LYX_USE_FRONTEND +LYX_USE_FRONTENDS ### Check for a C++ compiler LYX_PROG_CXX @@ -66,9 +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_STL_STRING -LYX_CXX_GOOD_STD_STRING -LYX_CXX_CHEADERS LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now @@ -78,14 +77,14 @@ LYX_CXX_STL_MODERN_STREAMS ### and now some special lyx flags. AC_ARG_ENABLE(assertions, - [ --enable-assertions add runtime sanity checks in the program],, + AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then enable_assertions=yes; else 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 @@ -118,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=""]) @@ -138,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 @@ -161,72 +155,97 @@ esac ### check which frontend we want to use -# XForms tests -LYX_PATH_XPM -LYX_PATH_XFORMS -LYX_CHECK_XFORMS_IMAGE_LOADER -# QT tests -QT_DO_IT_ALL +dnl if the gtk frontend has been specified, then xforms is needed too +if echo $FRONTENDS | grep gtk | grep -v xforms ; then + FRONTENDS="xforms $FRONTENDS" + noxformsbin=yes +fi -#LYX_USE_FRONTEND dnl The code below is not in a macro, because this would cause big -dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL. -case "$lyx_use_frontend" in - xforms) - FRONTEND="xforms" - RPM_FRONTEND="xforms" - RPM_FRONTEND_DEPS='libforms >= 1.0' - FRONTEND_GUILIB="frontends/xforms/libxforms.la" - FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\ - libforms version: ${XFORMS_VERSION}\n" - ;; -dnl gnome) -dnl LYX_PATH_XPM -dnl LYX_PATH_XFORMS -dnl LYX_CHECK_XFORMS_IMAGE_LOADER -dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) -dnl AC_SUBST(GNOME_FRONTEND_CFLAGS) -dnl AC_SUBST(GNOME_FRONTEND_LIBS) - -dnl FRONTEND="xforms gnome" -dnl FRONTEND_GUILIB="gnome/*.lo" -dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" -dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" -dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" -dnl ;; - qt) - RPM_FRONTEND="qt" - RPM_FRONTEND_DEPS='qt >= 2.2.1' - FRONTEND="qt2" - FRONTEND_GUILIB="frontends/qt2/libqt2.la" - FRONTEND_INCLUDES="\$(QT_INCLUDES)" - FRONTEND_INFO=" Qt version: ${QT_VERSION}\n" - ;; - *) - LYX_ERROR(Unknown frontend $lyx_use_frontend);; -esac +dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL. +for frontend in $FRONTENDS ; do + case "$frontend" in + xforms) + XFORMS_DO_IT_ALL + 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}\ + XForms Frontend:\n\ + libXpm version:\t\t${XPM_VERSION}\n\ + libforms version:\t\t${XFORMS_VERSION}\n" + ;; + dnl gnome) + dnl XFORMS_DO_IT_ALL + dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) + dnl AC_SUBST(GNOME_FRONTEND_CFLAGS) + dnl AC_SUBST(GNOME_FRONTEND_LIBS) + + dnl FRONTEND="xforms gnome" + dnl FRONTEND_GUILIB="gnome/*.lo" + dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" + dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" + dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" + dnl ;; + gtk) + PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4) + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk" + RPM_FRONTEND="gtk" + GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4` + LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4` + FRONTEND_INFO="${FRONTEND_INFO}\ + GTK Frontend:\n\ + libgtkmm version:\t\t${GTKMM_VERSION}\n\ + libglademm version:\t\t${LIBGLADEMM_VERSION}\n" + ;; + + qt) + QT_DO_IT_ALL + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2" + RPM_FRONTEND="qt" + FRONTEND_INFO="${FRONTEND_INFO}\ + Qt Frontend:\n\ + Qt version:\t\t${QT_VERSION}\n" +dnl qt build will fail without moc or uic + if test -z "$MOC"; then + LYX_ERROR([moc binary not found !]) + fi + if test -z "$UIC"; then + LYX_ERROR([uic binary not found !]) + fi + ;; + *) + LYX_ERROR(Unknown frontend '$frontend');; + 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 @@ -240,20 +259,50 @@ AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T -AC_CHECK_FUNCS(snprintf vsnprintf strerror) -LYX_CHECK_DECL(snprintf, stdio.h) -LYX_CHECK_DECL(vsnprintf, stdio.h) +AC_CHECK_FUNCS(strerror) LYX_CHECK_DECL(istreambuf_iterator, iterator) LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h]) +# Check the form of mkdir() +AC_FUNC_MKDIR + +AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[ + case "${enableval}" in + yes) use_compression=true ;; + no) use_compression=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;; + esac +],[use_compression=true]) +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_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) +AC_MSG_CHECKING([whether to support compressed files]) +AC_MSG_RESULT($use_compression) + + dnl This is a slight hack: the tests generated by autoconf 2.52 do not 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(memmove memset strchr 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 @@ -261,39 +310,42 @@ 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\ - Frontend: ${lyx_use_frontend}\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(RPM_FRONTEND_DEPS) +AC_SUBST(AM_CPPFLAGS) +AC_SUBST(AM_CXXFLAGS) +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_LDFLAGS) ## Some config.h stuff AH_TOP([ /* -*- C++ -*- */ -/* This is the compilation configuration file for LyX. It was generated by - autoconfs configure. You might want to change some of the defaults if - something goes wrong during the compilation - - * This file is part of - * ====================================================== - * - * LyX, the High Level Word Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - *======================================================*/ +/* + * \file config.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * This is the compilation configuration file for LyX. + * It was generated by autoconfs configure. + * You might want to change some of the defaults if something goes wrong + * during the compilation. + */ #ifndef _CONFIG_H #define _CONFIG_H @@ -303,14 +355,6 @@ AH_BOTTOM([ /************************************************************ ** You should not need to change anything beyond this point */ -#ifndef HAVE_STRCHR -# define strchr(a,b) index(a,b) -#endif - -#ifndef HAVE_MEMMOVE -# define memmove(a,b,c) bcopy(b,a,c) -#endif - #ifndef HAVE_STRERROR #if defined(__cplusplus) extern "C" @@ -318,10 +362,6 @@ extern "C" char * strerror(int n); #endif -#ifdef BROKEN_HEADERS -#include "broken_headers.h" -#endif - #ifdef HAVE_MKSTEMP #ifndef HAVE_DECL_MKSTEMP #if defined(__cplusplus) @@ -335,29 +375,38 @@ int mkstemp(char*); #include "support/os2_defines.h" #endif -#if defined(__CYGWIN__) || defined(__CYGWIN32__) -#include "support/nt_defines.h" -#endif - #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) #define USE_BOOST_FORMAT 1 #else #define USE_BOOST_FORMAT 0 #endif +#define BOOST_USER_CONFIG + +#if defined(ENABLE_ASSERTIONS) +#define BOOST_ENABLE_ASSERT_HANDLER 1 +#else +#define BOOST_DISABLE_ASSERTS 1 +#endif + #define BOOST_DISABLE_THREADS 1 -#define BOOST_NO_EXCEPTIONS 1 #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_FILES([Makefile \ +AC_CONFIG_SUBDIRS(lib) +AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ + boost/libs/filesystem/Makefile \ + boost/libs/filesystem/src/Makefile \ boost/libs/regex/Makefile \ boost/libs/regex/src/Makefile \ boost/libs/signals/Makefile \ @@ -366,28 +415,34 @@ AC_CONFIG_FILES([Makefile \ development/Makefile \ development/lyx.spec \ lib/Makefile \ + lib/doc/Makefile \ + lib/lyx2lyx/Makefile \ intl/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \ sourcedoc/Makefile \ + src/client/Makefile \ src/Makefile \ - src/version.C \ + src/version.C-tmp:src/version.C.in \ src/tex2lyx/Makefile \ src/mathed/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 \ - src/frontends/xforms/lyx_forms.h \ - src/frontends/xforms/lyx_xpm.h \ + src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \ + src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \ src/frontends/xforms/forms/Makefile \ + src/frontends/gtk/Makefile \ + src/frontends/gtk/gimages/Makefile \ + src/frontends/gtk/glade/Makefile \ src/frontends/qt2/Makefile \ src/frontends/qt2/moc/Makefile \ src/frontends/qt2/ui/Makefile \ src/frontends/qt2/ui/moc/Makefile \ - src/frontends/gnome/Makefile \ ]) AC_OUTPUT