X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=10e7839325c6b61dd9d3c60147ef14a8c12eca30;hb=4fff14150128dcf569ac291f28ab60f11fbab5b4;hp=10410de357393b7f5c59150330aadb3c9581fe95;hpb=7ec7c9da44662529e8a0ad4d60836df43a059ecd;p=lyx.git diff --git a/configure.in b/configure.in index 10410de357..10e7839325 100644 --- a/configure.in +++ b/configure.in @@ -1,27 +1,26 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(src/lyx.C) +AC_INIT(src/main.C) AC_PREREQ(2.13) dnl We want to use autoconf 2.13 AM_CONFIG_HEADER(src/config.h) dnl This is a trick to make autoheader do the right thing dnl AM_CONFIG_HEADER(src/config.h) AC_CONFIG_AUX_DIR(config) -LYX_GET_VERSION(${srcdir}/src/version.h) + +PACKAGE=lyx${program_suffix} +VERSION="1.2.0cvs" +LYX_CHECK_VERSION AC_CANONICAL_SYSTEM AC_VALIDATE_CACHE_SYSTEM_TYPE -AC_ARG_WITH(lyxname, - [ --with-lyxname the name under which lyx will be installed], - [lyxname=$withval],[lyxname=lyx]) - +LYX_VERSION_SUFFIX + AM_INIT_AUTOMAKE($lyxname, $VERSION) # The list of languages known to LyX # This is needed by GNU gettext -ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa" - -AC_PREFIX_PROGRAM(lyx) +ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa" # fix the value of the prefixes. test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -73,30 +72,37 @@ case "$lyx_use_frontend" in esac ### Check for a C++ compiler -AC_LANG_CPLUSPLUS LYX_PROG_CXX -AC_PROG_CXXCPP -AC_DISABLE_SHARED -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL - ### Some checks on what the C++ compiler can(not) do -LYX_CXX_MUTABLE -LYX_CXX_PARTIAL +AC_LANG_CPLUSPLUS +dnl we do not need that currently (and probably all our supported +dnl compiler allow that) +dnl LYX_CXX_PARTIAL LYX_CXX_EXPLICIT -dnl we do not use stl stack, or at least not on gcc 2.7, which was the -dnl cause for this test. -dnl LYX_CXX_STL_STACK LYX_CXX_STL_STRING LYX_CXX_GOOD_STD_STRING -LYX_CXX_NAMESPACES LYX_CXX_CHEADERS +LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI -AC_CHECK_HEADERS(ostream istream sstream locale) +AC_CHECK_HEADERS(ostream istream sstream locale limits) LYX_CXX_STL_MODERN_STREAMS +### and now some special lyx flags. +AC_ARG_ENABLE(assertions, + [ --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" + AC_DEFINE(ENABLE_ASSERTIONS,1, + [Define if you want assertions to be enabled in the code]) +fi + ### We need a regex implementation, so we provide our own if none is found. LYX_REGEX @@ -105,6 +111,16 @@ dnl by testing these we check if it is ok to have dnl -lc and -lm as args to the compiler AC_CHECK_LIB(m, sin) AC_CHECK_LIB(c, fopen) +AC_ARG_WITH(aiksaurus, + [ --without-aiksaurus do not use the Aiksaurus library], + [lyx_use_aiksaurus=$withval]) +if test x$lyx_use_aiksaurus != xno; then +AC_CHECK_LIB(Aiksaurus, main, + [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library]) + AIKSAURUS_LIBS="-lAiksaurus -lbz2" + ],,"-lbz2") +fi +AC_SUBST(AIKSAURUS_LIBS) ### Add extra directories to check for libraries. LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE) @@ -132,6 +148,12 @@ if test x$lyx_use_liberty = xyes; then AC_CHECK_LIB(iberty,main) fi +### Setup libtool +AC_DISABLE_SHARED +AC_LIBTOOL_WIN32_DLL +#AM_PROG_LIBTOOL +LYX_PROG_LIBTOOL + ### Check which libsigc++ we're using LYX_WITH_SIGC @@ -139,8 +161,8 @@ LYX_WITH_SIGC CHECK_WITH_PSPELL ### Check for X libraries -# Check for the pt library (for SCO, needed for X) -AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS") +dnl # Check for the pt library (for SCO, needed for X) +dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS") # The real thing. AC_PATH_XTRA LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" @@ -162,45 +184,83 @@ AC_CHECK_FUNCS(XOpenIM) 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 - kde) - KDE_DO_IT_ALL - FRONTEND="kde" - FRONTEND_GUILIB="\${top_builddir}/src/frontends/kde/libkde.la" - FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)" - FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)" - FRONTEND_LIBS="\$(KDE_LIBS)";; xforms) # for now don't set it for xforms as this is always entered - FRONTEND="" - FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";; - gnome) + LYX_PATH_XPM + LYX_PATH_XFORMS + FRONTEND="xforms" + FRONTEND_GUILIB="xforms/*.lo" + FRONTEND_INCLUDES="-I\$(srcdir)/xforms" + FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@" + FRONTEND_INFO=`cat < /dev/null 2>&1; then + AC_MSG_RESULT(found) + else + AC_MSG_ERROR(Did not find libGlade installed) + fi + + FRONTEND="xforms gnome" + FRONTEND_GUILIB="gnome/*.lo" FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)" - FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)" - FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)";; + FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`" + FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";; + qt2) + LYX_PATH_XPM + LYX_PATH_XFORMS + QT2_DO_IT_ALL + FRONTEND="qt2" + FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo" + FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)" + FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)" + FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";; *) LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac ### Check for xforms and xpm (only if X has been found). -if test "$have_x" = yes ; then +if test "$have_x" = no ; then # We surely need these two libraries and want to check carefully the # version numbers... -LYX_PATH_XPM -LYX_PATH_XFORMS -AC_SUBST(LYX_LIBS) -else +#LYX_PATH_XPM +#LYX_PATH_XFORMS +#FRONTEND_INFO=`cat < po/Makefile]) - - -cat <