X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=fbe9452a005c4a9086feaa18e2fe860ce7b962f1;hb=16a5be3ecce17f7a2c3e2e8fda096a6ca2ad6161;hp=96cc087288b1b5445518a64aabcd0e48b5008af5;hpb=ddf753c64a33f99eaa0c3f373983634f9a68ff51;p=lyx.git diff --git a/configure.in b/configure.in index 96cc087288..fbe9452a00 100644 --- a/configure.in +++ b/configure.in @@ -11,11 +11,15 @@ LYX_GET_VERSION(${srcdir}/src/version.h) AC_CANONICAL_SYSTEM AC_VALIDATE_CACHE_SYSTEM_TYPE -AM_INIT_AUTOMAKE(lyx, $VERSION) +AC_ARG_WITH(lyxname, + [ --with-lyxname the name under which lyx will be installed], + [lyxname=$withval],[lyxname=lyx]) + +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 fi fr hu it nl no pl pt ru sl sv tr wa" +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) @@ -24,8 +28,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' ### Set the execute permissions of the various scripts correctly -for file in config/install-sh config/mkinstalldirs config/hack-gcc \ - lib/configure ; do +for file in config/install-sh config/mkinstalldirs lib/configure ; do chmod 755 ${srcdir}/${file} done @@ -39,6 +42,12 @@ if test "x$KPSEWHICH" = xkpsewhich ; then [Define this if you have the kpsewhich program working on your system.]) fi +# Work around a problem in automake 1.4: when invoking install-strip, +# INSTALL_PROGRAM is changed to 'install -s', and since +# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0 +# which returns an error condition when stripping fails. +INSTALL_SCRIPT='${INSTALL}' + ### we will also need a C compiler to compile GNU gettext AC_PROG_CC @@ -52,6 +61,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 @@ -60,8 +80,7 @@ AC_DISABLE_SHARED AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -### check the size of pointers and ints -# the defaults are given for cross compilation. +### Some checks on what the C++ compiler can(not) do LYX_CXX_MUTABLE LYX_CXX_PARTIAL LYX_CXX_EXPLICIT @@ -69,13 +88,19 @@ 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) +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. +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 @@ -108,17 +133,61 @@ if test x$lyx_use_liberty = xyes; then AC_CHECK_LIB(iberty,main) 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") # The real thing. AC_PATH_XTRA LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" +# Since solaris X headers use int as implicit return type and modern +# gcc's do not like that, let's use -isystem instead of -I. +# We should test for gcc version and see whether it supports -isystem, +# but since at least gcc 2.6.x supports it and it is still too old for +# us, it seems we are safe. +if test -n "$GXX" ; then + X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` +fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" ## Check whether X is new enough to handle the input method stuff 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 + 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) + # 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)";; + *) + 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 # We surely need these two libraries and want to check carefully the @@ -153,7 +222,11 @@ AC_LANG_CPLUSPLUS # some standard header files AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h stl_string_fwd.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h) + +# some annoying header files +#LYX_PATH_HEADER(stl_string_fwd.h) +LYX_STL_STRING_FWD # some standard structures AC_HEADER_STAT @@ -172,41 +245,62 @@ AC_TYPE_UID_T # some functions we'd like to have AC_ARG_WITH(broken-headers, - [ --with-broken-headers define some functions on SunOS4 and SCO], + [ --with-broken-headers define some functions on SunOS4 and SCO], [lyx_broken_headers=$withval]) if test "x$lyx_broken_headers" = "xyes"; then lyx_flags="$lyx_flags broken-headers" 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(memmove memset strchr putenv setenv mkfifo snprintf vsnprintf) +AC_CHECK_FUNCS(mkstemp mktemp) dnl Until this is fixed in autoconf we provide our own version LYX_FUNC_SELECT_ARGTYPES +dnl check whether we have to work around solaris broken putenv() +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_WITH(two-colors,[ --with-two-colors use two color pixmaps], - [AC_DEFINE(TWO_COLOR_ICONS) - lyx_flags="$lyx_flags two-colors"]) -AC_ARG_WITH(debug,[ --with-debug output debug information by default], - [AC_DEFINE(DEBUG_AS_DEFAULT,1, - [Define if you want debugging turned on as default.]) - lyx_flags="$lyx_flags debug"]) +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 ### Finish the work. -AC_CONFIG_SUBDIRS(lib lib/reLyX) +AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX) AC_OUTPUT([Makefile \ development/lyx.spec \ lib/Makefile \ intl/Makefile \ po/Makefile.in \ + boost/Makefile \ src/Makefile \ src/mathed/Makefile \ + src/graphics/Makefile \ src/insets/Makefile \ src/support/Makefile \ + src/frontends/Makefile \ + src/frontends/support/Makefile \ + src/frontends/xforms/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]) @@ -226,4 +320,3 @@ EOF # Display a final warning if there has been a LYX_ERROR LYX_CHECK_ERRORS -