X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c2d5984e6a9101e6b935c8be85e02527d041f2c8;hb=e977a3e509c95d9460c2523988cf994b1941b543;hp=ac2ebfcb5ffe7ff6c0749ef26860c46a10f5f5e5;hpb=fdd388d4b705cebc42b0ec7dcc186c531353d7ac;p=lyx.git diff --git a/configure.ac b/configure.ac index ac2ebfcb5f..c2d5984e6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,29 +1,34 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org) +AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) -AM_CONFIG_HEADER([src/config.h]) +AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_AUX_DIR(config) -PACKAGE=lyx${program_suffix} -VERSION="1.4.0cvs" +# First check the version LYX_CHECK_VERSION +LYX_VERSION_SUFFIX +# Check how the files should be packaged +AC_CANONICAL_TARGET +LYX_USE_PACKAGING +# We need to define these variables here and the no-define option of +# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) 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) +save_PACKAGE=$PACKAGE +AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9]) +PACKAGE=$save_PACKAGE ### Set the execute permissions of the various scripts correctly -for file in config/install-sh config/mkinstalldirs lib/configure ; do +for file in config/install-sh config/mkinstalldirs ; do chmod 755 ${srcdir}/${file} done @@ -156,21 +161,13 @@ esac ### check which frontend we want to use -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 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL. for frontend in $FRONTENDS ; do case "$frontend" in xforms) XFORMS_DO_IT_ALL - if test -z "$noxformsbin" ; then - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" - fi + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms" RPM_FRONTEND="xforms" FRONTEND_INFO="${FRONTEND_INFO}\ @@ -178,20 +175,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" @@ -222,13 +207,30 @@ dnl qt build will fail without moc or uic LYX_ERROR([qt library not found !]) fi ;; + qt4) + QT4_DO_IT_ALL + FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)" + FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4" + RPM_FRONTEND="qt4" + FRONTEND_INFO="${FRONTEND_INFO}\ + Qt 4 Frontend:\n\ + Qt 4 version:\t\t${QT4_VERSION}\n" +dnl qt 4 build will fail without moc or uic + if test -z "$MOC4"; then + LYX_ERROR([moc 4 binary not found !]) + fi + if test -z "$UIC4"; then + LYX_ERROR([uic 4 binary not found !]) + fi + if test -z "$QT4_LIB"; then + LYX_ERROR([qt 4 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}' @@ -249,7 +251,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 io.h process.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 @@ -302,16 +304,26 @@ LYX_CHECK_SPELL_ENGINES lyx_client_subdir=true AC_LANG_PUSH(C) -AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false]) +dnl LIBS already contains some X extra libs that may interfere. +save_LIBS="$LIBS" +LIBS= +AC_CHECK_FUNCS(fcntl, + [AC_SEARCH_LIBS([gethostbyname], [nsl]) + AC_SEARCH_LIBS([socket], [socket], [], + [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], + [], [-lnsl])])], + [lyx_client_subdir=false]) +AC_SUBST(SOCKET_LIBS,$LIBS) +LIBS="$save_LIBS" AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir) AC_LANG_POP(C) - AC_FUNC_SELECT_ARGTYPES ### Some information on what just happened real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` -real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"` +real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"` +real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` VERSION_INFO="Configuration\n\ Host type: ${host}\n\ Special build flags: ${lyx_flags}\n\ @@ -326,8 +338,11 @@ VERSION_INFO="Configuration\n\ ${FRONTEND_INFO}\ Packaging: ${lyx_use_packaging}\n\ LyX binary dir: ${real_bindir}\n\ - LyX files dir: ${real_datadir}\n" + LyX files dir: ${real_pkgdatadir}\n" +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_pkgdatadir}) AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) @@ -335,6 +350,9 @@ 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 @@ -376,36 +394,38 @@ int mkstemp(char*); #endif #ifdef __EMX__ -#include "support/os2_defines.h" +# include "support/os2_defines.h" #endif #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) -#define USE_BOOST_FORMAT 1 +# define USE_BOOST_FORMAT 1 #else -#define USE_BOOST_FORMAT 0 +# define USE_BOOST_FORMAT 0 #endif #define BOOST_USER_CONFIG -#if defined(ENABLE_ASSERTIONS) -#define BOOST_ENABLE_ASSERT_HANDLER 1 -#else -#define BOOST_DISABLE_ASSERTS 1 +#if !defined(ENABLE_ASSERTIONS) +# define BOOST_DISABLE_ASSERTS 1 #endif +#define BOOST_ENABLE_ASSERT_HANDLER 1 #define BOOST_DISABLE_THREADS 1 #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 #ifdef __CYGWIN__ -#define BOOST_POSIX 1 +# define BOOST_POSIX 1 +#endif + +#if defined(HAVE_NEWAPIS_H) +# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 #endif #endif ]) ### Finish the work. -AC_CONFIG_SUBDIRS(lib) AC_CONFIG_FILES([Makefile m4/Makefile \ boost/Makefile \ boost/libs/Makefile \ @@ -436,6 +456,7 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ src/support/tests/Makefile \ src/frontends/Makefile \ src/frontends/controllers/Makefile \ + src/frontends/controllers/tests/Makefile \ src/frontends/xforms/Makefile \ src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \ src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \ @@ -447,7 +468,12 @@ AC_CONFIG_FILES([Makefile m4/Makefile \ src/frontends/qt2/moc/Makefile \ src/frontends/qt2/ui/Makefile \ src/frontends/qt2/ui/moc/Makefile \ + src/frontends/qt4/Makefile \ + src/frontends/qt4/moc/Makefile \ + src/frontends/qt4/ui/Makefile \ ]) +echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\"" +(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix") AC_OUTPUT # show version information