X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=43864ca504e4c7f6f1aa2c2508be8e2da5c936a1;hb=61fc3710932a0ef5f93a0fbefa6c1cfd43654702;hp=37d9c8159a9f77393816feab5e3e7392a5ef5040;hpb=347768e3d1645f9d07d5615b34417d8a021335e9;p=lyx.git diff --git a/configure.in b/configure.in index 37d9c8159a..43864ca504 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ dnl AM_CONFIG_HEADER(src/config.h) AC_CONFIG_AUX_DIR(config) PACKAGE=lyx${program_suffix} -VERSION="1.2.0pre5" +VERSION="1.3.0cvs" LYX_CHECK_VERSION AC_CANONICAL_SYSTEM @@ -63,14 +63,8 @@ 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 @@ -104,24 +98,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) @@ -139,15 +120,16 @@ 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 @@ -155,9 +137,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 @@ -179,50 +158,43 @@ 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) # 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="@XFORMS_LIB@ @XPM_LIB@" + 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 < /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 qt2/xforms/*.lo" @@ -256,7 +228,6 @@ fi ### For now, run this test always so config.h is unchanged by a change in ### frontend LYX_USE_XFORMS_IMAGE_LOADER -LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG ### Setup GNU gettext dnl GNU gettext is written in C @@ -280,10 +251,6 @@ AC_HEADER_DIRENT AC_HEADER_MAJOR AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h) -# some annoying header files -#LYX_PATH_HEADER(stl_string_fwd.h) -LYX_STL_STRING_FWD - # some standard structures AC_HEADER_STAT AC_HEADER_TIME @@ -337,7 +304,7 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` VERSION_INFO=`cat <