X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c2d5984e6a9101e6b935c8be85e02527d041f2c8;hb=e977a3e509c95d9460c2523988cf994b1941b543;hp=44e36a56e27506304174dadf032a6736383ee94d;hpb=1a0a8cdea2521c1351e1c7e85e17c451f2063456;p=lyx.git diff --git a/configure.ac b/configure.ac index 44e36a56e2..c2d5984e6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,1.4.0cvs,[lyx-devel@lists.lyx.org],[lyx]) +AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) AC_CONFIG_HEADERS([src/config.h]) @@ -9,11 +9,13 @@ AC_CONFIG_AUX_DIR(config) # First check the version LYX_CHECK_VERSION -AC_CANONICAL_TARGET - +LYX_VERSION_SUFFIX # Check how the files should be packaged +AC_CANONICAL_TARGET LYX_USE_PACKAGING -LYX_VERSION_SUFFIX +# 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 @@ -21,10 +23,12 @@ if test "${enable_maintainer_mode+set}" != set; then fi AM_MAINTAINER_MODE -AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar 1.9]) +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 @@ -157,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}\ @@ -211,6 +207,25 @@ 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 @@ -307,7 +322,8 @@ 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\ @@ -322,12 +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" -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}) +MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir}) AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) @@ -379,40 +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 +# 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 \ @@ -443,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 \ @@ -454,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