X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=807c5b75cbfd56408d587fad1b4ee3a9bc660944;hb=a29f509e1bca722dd26c8b9c37590fc78b46ba0c;hp=7741e6d963848db656a44788577bdb4c434b100b;hpb=935e0293dc27a2b8b2be2fb6d30223ce9898af1d;p=lyx.git diff --git a/configure.ac b/configure.ac index 7741e6d963..807c5b75cb 100644 --- a/configure.ac +++ b/configure.ac @@ -7,20 +7,21 @@ AM_CONFIG_HEADER([src/config.h]) AC_CONFIG_AUX_DIR(config) -PACKAGE=lyx${program_suffix} +# first the version VERSION="1.4.0cvs" LYX_CHECK_VERSION +AC_CANONICAL_TARGET +# Check how the files should be packaged +LYX_USE_PACKAGING +LYX_VERSION_SUFFIX dnl default maintainer mode to true for development versions if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi AM_MAINTAINER_MODE -AC_CANONICAL_TARGET -LYX_VERSION_SUFFIX - -AM_INIT_AUTOMAKE($lyxname, $VERSION) +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) ### Set the execute permissions of the various scripts correctly for file in config/install-sh config/mkinstalldirs lib/configure ; do @@ -30,6 +31,10 @@ done ### Check for programs AC_PROG_MAKE_SET AC_PROG_INSTALL + +AC_PROG_AWK +test "$AWK" = gawk && AWK="gawk --posix" + #AC_PROG_RANLIB AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :) if test "x$KPSEWHICH" = xkpsewhich ; then @@ -38,6 +43,9 @@ if test "x$KPSEWHICH" = xkpsewhich ; then fi AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) +# Check for installed python +AM_PATH_PYTHON(1.5.2,, :) + # 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 @@ -78,7 +86,7 @@ AC_ARG_ENABLE(assertions, enable_assertions=no; fi;]) if test "x$enable_assertions" = xyes ; then - lyx_flags="$lyx_flags assertions" + lyx_flags="assertions $lyx_flags" AC_DEFINE(ENABLE_ASSERTIONS,1, [Define if you want assertions to be enabled in the code]) fi @@ -112,7 +120,7 @@ if test x$lyx_use_aiksaurus != xno; then AC_CHECK_LIB(Aiksaurus, main, [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library]) AIKSAURUS_LIBS="-lAiksaurus" - lyx_flags="$lyx_flags aiksaurus" + lyx_flags="aiksaurus $lyx_flags" ]) AC_CHECK_HEADER(Aiksaurus.h,[ ac_cv_header_aiksaurus_h=yes @@ -152,6 +160,7 @@ esac dnl if the gtk frontend has been specified, then xforms is needed too if echo $FRONTENDS | grep gtk | grep -v xforms ; then FRONTENDS="xforms $FRONTENDS" + noxformsbin=yes fi dnl The code below is not in a macro, because this would cause big @@ -160,7 +169,9 @@ for frontend in $FRONTENDS ; do case "$frontend" in xforms) XFORMS_DO_IT_ALL - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" + if test -z "$noxformsbin" ; then + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" + fi FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms" RPM_FRONTEND="xforms" FRONTEND_INFO="${FRONTEND_INFO}\ @@ -168,20 +179,8 @@ for frontend in $FRONTENDS ; do libXpm version:\t\t${XPM_VERSION}\n\ libforms version:\t\t${XFORMS_VERSION}\n" ;; - dnl gnome) - dnl XFORMS_DO_IT_ALL - dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) - dnl AC_SUBST(GNOME_FRONTEND_CFLAGS) - dnl AC_SUBST(GNOME_FRONTEND_LIBS) - - dnl FRONTEND="xforms gnome" - dnl FRONTEND_GUILIB="gnome/*.lo" - dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" - dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}" - dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" - dnl ;; gtk) - PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4) + PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft) FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk" RPM_FRONTEND="gtk" @@ -208,14 +207,15 @@ dnl qt build will fail without moc or uic if test -z "$UIC"; then LYX_ERROR([uic binary not found !]) fi + if test -z "$QT_LIB"; then + LYX_ERROR([qt library not found !]) + fi ;; *) LYX_ERROR(Unknown frontend '$frontend');; esac done -### Check how the files should be packaged -LYX_USE_PACKAGING # fix the value of the prefixes. test "x$prefix" = xNONE && prefix=$default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -236,7 +236,7 @@ AC_LANG_POP(C) # some standard header files AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h NewAPIs.h) # some standard structures AC_HEADER_STAT @@ -269,7 +269,7 @@ if test $use_compression=true ; then AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false) if test $use_compression = true ; then AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.]) - lyx_flags="$lyx_flags compression" + lyx_flags="compression $lyx_flags" fi fi AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue) @@ -282,7 +282,7 @@ dnl work correctly because of some conflict with stdlib.h with g++ 2.96 dnl We aim to remove this eventually, since we should test as much as dnl possible with the compiler which will use the functions (JMarc) AC_LANG_PUSH(C) -AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink) +AC_CHECK_FUNCS(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink) AC_LANG_POP(C) LYX_CHECK_SPELL_ENGINES @@ -293,7 +293,6 @@ AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false]) AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir) AC_LANG_POP(C) - AC_FUNC_SELECT_ARGTYPES ### Some information on what just happened @@ -301,20 +300,34 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` VERSION_INFO="Configuration\n\ Host type: ${host}\n\ - Special build flags: ${lyx_flags}\n\ - C Compiler: ${CC}\n\ + Special build flags: ${lyx_flags}\n\ + C Compiler: ${CC} ${CC_VERSION}\n\ + C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ + C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ - Linker flags: ${LDFLAGS}\n\ + Linker flags: ${AM_LDFLAGS}\n\ + Linker user flags: ${LDFLAGS}\n\ ${FRONTEND_INFO}\ Packaging: ${lyx_use_packaging}\n\ LyX binary dir: ${real_bindir}\n\ LyX files dir: ${real_datadir}\n" +real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` +MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir}) +MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir}) +MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_datadir}) AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) +AC_SUBST(AM_CPPFLAGS) +AC_SUBST(AM_CXXFLAGS) +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_LDFLAGS) +AC_SUBST(LYX_ABS_TOP_SRCDIR) +AC_SUBST(LYX_ABS_INSTALLED_LOCALEDIR) +AC_SUBST(LYX_ABS_INSTALLED_DATADIR) ## Some config.h stuff @@ -381,11 +394,15 @@ int mkstemp(char*); #define BOOST_POSIX 1 #endif +#if defined(HAVE_NEWAPIS_H) +#define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 +#endif + #endif ]) ### Finish the work. -AC_CONFIG_SUBDIRS(lib lib/reLyX) +AC_CONFIG_SUBDIRS(lib) AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ @@ -400,6 +417,7 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ development/lyx.spec \ lib/Makefile \ lib/doc/Makefile \ + lib/lyx2lyx/Makefile \ intl/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \