X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=c4337bff6f805d9a5c5b68771e2b7f9b8bd00a4d;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f0843f7aa5241609b4f25eb5af7c4abfb3486660;hpb=c4b2613c6b791a087affa244ef3bcf965246a347;p=lyx.git diff --git a/configure.in b/configure.in index f0843f7aa5..c4337bff6f 100644 --- a/configure.in +++ b/configure.in @@ -6,20 +6,21 @@ 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 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="bg 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 @@ -68,20 +69,14 @@ case "$lyx_use_frontend" in GNOME_INIT GNOME_COMPILE_WARNINGS GNOME_X_CHECKS -esac +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 -LYX_PROG_LIBTOOL - ### Some checks on what the C++ compiler can(not) do +AC_LANG_CPLUSPLUS dnl we do not need that currently (and probably all our supported -dnl compiler allow that) +dnl compiler allow that) dnl LYX_CXX_PARTIAL LYX_CXX_EXPLICIT LYX_CXX_STL_STRING @@ -94,6 +89,20 @@ dnl LYX_CXX_RTTI 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 @@ -102,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) @@ -118,7 +137,7 @@ LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${ LYX_LOOP_DIR($lyx_cv_extra_prefix,[ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include) LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)]) - + ### Check for the -liberty library test "x$GXX" = xyes && lyx_use_liberty=yes AC_ARG_WITH(liberty, @@ -129,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 @@ -136,8 +161,6 @@ 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") # The real thing. AC_PATH_XTRA LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" @@ -157,15 +180,26 @@ AC_CHECK_FUNCS(XOpenIM) ### check which frontend we want to use #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) +dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL. +case "$lyx_use_frontend" in + xforms) # for now don't set it for xforms as this is always entered - FRONTEND="" - FRONTEND_GUILIB="xforms/libxforms.la";; - gnome) + LYX_PATH_XPM + LYX_PATH_XFORMS + FRONTEND="xforms" + FRONTEND_GUILIB="xforms/*.lo" + FRONTEND_INCLUDES="-I\$(srcdir)/xforms" + FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@" + FRONTEND_INFO=`cat < /dev/null 2>&1; then - AC_MSG_RESULT(found) + if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then + AC_MSG_RESULT(found) else AC_MSG_ERROR(Did not find libGlade installed) fi - - FRONTEND="gnome" - FRONTEND_GUILIB="gnome/libgnome.la" + + 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) `gnome-config --libs libglade`";; + FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`" + FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(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/libqt2.la" + FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo" FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)" - FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)" - FRONTEND_LIBS="\$(QT2_LIBS)";; + 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 +# version numbers... +#LYX_PATH_XPM +#LYX_PATH_XFORMS +#FRONTEND_INFO=`cat <