X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=5a141386579fdb1dfa763dbfdd93c599b71a7b65;hb=28307966381dd022bfc2df3beb4a8cf0d8958f46;hp=a2228f24cff39563576fd7235badb9dd71f524ff;hpb=2aafd9bf9421964e013b595a911e016ae8043260;p=lyx.git diff --git a/configure.in b/configure.in index a2228f24cf..5a14138657 100644 --- a/configure.in +++ b/configure.in @@ -8,14 +8,14 @@ dnl AM_CONFIG_HEADER(src/config.h) AC_CONFIG_AUX_DIR(config) PACKAGE=lyx${program_suffix} -VERSION="1.2.0cvs" +VERSION="1.3.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 @@ -40,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 @@ -53,30 +54,21 @@ AC_PROG_CC ### check for special systems AC_ISC_POSIX AC_AIX -LYX_HPUX -LYX_SUNOS4 -LYX_SCO ### Check for program extensions (.exe or nothing) 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 LYX_PROG_CXX ### 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 @@ -103,24 +95,11 @@ if test "x$enable_assertions" = xyes ; then [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 - ### Library Files 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) @@ -137,16 +116,17 @@ 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) ### Setup libtool AC_DISABLE_SHARED @@ -154,9 +134,6 @@ AC_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL LYX_PROG_LIBTOOL -### Check which libsigc++ we're using -LYX_WITH_SIGC - ### Check if we want pspell libraries CHECK_WITH_PSPELL @@ -178,76 +155,56 @@ 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 - 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 - LYX_PATH_XPM - LYX_PATH_XFORMS FRONTEND="xforms" - FRONTEND_GUILIB="xforms/*.lo" + FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.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 - + PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) + AC_SUBST(GNOME_FRONTEND_CFLAGS) + AC_SUBST(GNOME_FRONTEND_LIBS) + FRONTEND="xforms gnome" FRONTEND_GUILIB="gnome/*.lo" - FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)" - 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`";; + FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" + FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " + FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";; 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)";; + FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)" + FRONTEND_LIBS="\$(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" = no ; then -# We surely need these two libraries and want to check carefully the -# version numbers... -#LYX_PATH_XPM -#LYX_PATH_XFORMS -#FRONTEND_INFO=`cat <