X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=efaee32653774987b088a1af1136cf9226904235;hb=514059ce7dd15a0f73c8362c29d22eb09fd00864;hp=e9bdc94887886aa41b19a3987e6e8dc96f3a585d;hpb=2bf37e842e99d0f7523201d9b07484e576899a66;p=lyx.git diff --git a/configure.in b/configure.in index e9bdc94887..efaee32653 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ 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 @@ -11,10 +11,8 @@ LYX_GET_VERSION(${srcdir}/src/version.h) 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 @@ -61,6 +59,17 @@ 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 + ### Check for a C++ compiler AC_LANG_CPLUSPLUS LYX_PROG_CXX @@ -77,12 +86,14 @@ 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) +AC_CHECK_HEADERS(ostream istream sstream locale) LYX_CXX_STL_MODERN_STREAMS ### We need a regex implementation, so we provide our own if none is found. @@ -123,6 +134,9 @@ fi ### Check which libsigc++ we're using LYX_WITH_SIGC +### 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") @@ -143,7 +157,7 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_FUNCS(XOpenIM) ### check which frontend we want to use -LYX_USE_FRONTEND +#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 @@ -152,12 +166,41 @@ case "$lyx_use_frontend" in FRONTEND="kde" FRONTEND_GUILIB="\${top_builddir}/src/frontends/kde/libkde.la" FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)" - FRONTEND_INCLUDES="\$(QT_INCLUDES) \$(KDE_INCLUDES)" - FRONTEND_LIBS="\$(KDE_LIBS)" - AC_DEFINE(KDEGUI);; + FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)" + FRONTEND_LIBS="\$(KDE_LIBS)";; xforms) - FRONTEND="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 + +dnl ****************************** +dnl LibGlade checking +dnl ****************************** +dnl Ensure gnome-config is available... + AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) + AC_MSG_CHECKING(for Glade libraries) + 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="\${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) `gnome-config --libs libglade`";; + qt2) + QT2_DO_IT_ALL + FRONTEND="qt2" + FRONTEND_GUILIB="\${top_builddir}/src/frontends/qt2/libqt2.la" + FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)" + FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)" + FRONTEND_LIBS="\$(QT2_LIBS)";; *) LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac @@ -226,7 +269,12 @@ if test "x$lyx_broken_headers" = "xyes"; then AC_DEFINE(BROKEN_HEADERS, 1, [Define on SunOS 4 and SCO, were some functions are missing from the headers]) fi -AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo) +AC_CHECK_FUNCS(snprintf vsnprintf) +LYX_CHECK_DECL(snprintf, stdio.h) +LYX_CHECK_DECL(vsnprintf, stdio.h) + +AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \ + mkstemp mktemp) dnl Until this is fixed in autoconf we provide our own version LYX_FUNC_SELECT_ARGTYPES @@ -237,6 +285,8 @@ LYX_FUNC_PUTENV_ARGTYPE # SunOS 4.1.3 does not have strerror and atexit AC_REPLACE_FUNCS(strerror atexit) +LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h]) + ### and now some special lyx flags. AC_ARG_ENABLE(assertions, [ --enable-assertions add runtime sanity checks in the program],, @@ -252,20 +302,28 @@ if test "x$enable_assertions" = xyes ; then fi ### Finish the work. -AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX) +AC_CONFIG_SUBDIRS(boost sigc++ lib lib/reLyX) AC_OUTPUT([Makefile \ development/lyx.spec \ lib/Makefile \ intl/Makefile \ po/Makefile.in \ + sourcedoc/Doxyfile \ src/Makefile \ src/mathed/Makefile \ + src/graphics/Makefile \ src/insets/Makefile \ src/support/Makefile \ - src/xtl/Makefile \ src/frontends/Makefile \ + src/frontends/support/Makefile \ + src/frontends/controllers/Makefile \ src/frontends/xforms/Makefile \ + src/frontends/qt2/Makefile \ src/frontends/kde/Makefile \ + src/frontends/kde/moc/Makefile \ + src/frontends/kde/dlg/Makefile \ + src/frontends/kde/dlg/moc/Makefile \ + src/frontends/gnome/Makefile \ ], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])