X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=43864ca504e4c7f6f1aa2c2508be8e2da5c936a1;hb=6ae1cb1d6c6dcb4ef93a7dafd047a6af16e4c338;hp=677b924a9a03bab82e53739774335358df00d9a4;hpb=f6aaac088c411f6d03bab73695b14a5441ea85b1;p=lyx.git diff --git a/configure.in b/configure.in index 677b924a9a..43864ca504 100644 --- a/configure.in +++ b/configure.in @@ -1,29 +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.3.0cvs" +LYX_CHECK_VERSION AC_CANONICAL_SYSTEM AC_VALIDATE_CACHE_SYSTEM_TYPE -AC_ARG_WITH(lyx-suffix, - [ --with-lyx-suffix install lyx files as lyx-], - [lyxname="lyx-$withval" - program_suffix=-$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="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 @@ -43,6 +40,7 @@ if test "x$KPSEWHICH" = xkpsewhich ; then AC_DEFINE(HAVE_KPSEWHICH, 1, [Define this if you have the kpsewhich program working on your system.]) fi +AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) # Work around a problem in automake 1.4: when invoking install-strip, # INSTALL_PROGRAM is changed to 'install -s', and since @@ -65,43 +63,40 @@ AC_EXEEXT ### 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 - gnome) - GNOME_INIT - GNOME_COMPILE_WARNINGS - GNOME_X_CHECKS -esac + +#old gnome stuff removed by Michael Koziarski 25-05-2002 ### 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 -### We need a regex implementation, so we provide our own if none is found. -LYX_REGEX +### 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 ### Library Files dnl by testing these we check if it is ok to have @@ -124,26 +119,28 @@ 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, - [ --without-liberty do not try to link against libiberty.a], - [lyx_use_liberty=$withval]) -if test x$lyx_use_liberty = xyes; then - # AC_CHECK_LIB(iberty,main,LIBS="-liberty $LIBS") - AC_CHECK_LIB(iberty,main) + +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) -### Check which libsigc++ we're using -LYX_WITH_SIGC +### Setup libtool +AC_DISABLE_SHARED +AC_LIBTOOL_WIN32_DLL +#AM_PROG_LIBTOOL +LYX_PROG_LIBTOOL ### Check if we want pspell libraries 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" @@ -161,56 +158,77 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_FUNCS(XOpenIM) ### check which frontend we want to use +# We have to check for xforms anyway +LYX_PATH_XPM +LYX_PATH_XFORMS + #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 - 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) +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="\${top_builddir}/src/frontends/xforms/libxforms.la";; - gnome) - AM_PATH_GTKMM(1.2.1,, - AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+)) - AM_PATH_GNOMEMM - - FRONTEND="gnome" - FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la" - FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)" - FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)" - FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)";; + FRONTEND="xforms" + FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo" + FRONTEND_INCLUDES="-I\$(srcdir)/xforms" + case "$host" in + *cygwin) + FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@" + ;; + *) + FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@" + ;; + esac + FRONTEND_INFO=`cat < po/Makefile]) - - -cat <