X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9d3e31aa0274403dac6bac8cee4bb02429d4f844;hb=a7a218d61d7483e128050d2e5c7c4d8cb7da1ca9;hp=39d2292e7d628cf7fdc55715c35b677ca62260a2;hpb=d65a564adfbfa098fbb22026559461df9186746a;p=lyx.git diff --git a/configure.ac b/configure.ac index 39d2292e7d..9d3e31aa02 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx]) -AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"]) +AC_SUBST(LYX_DATE, ["Tue, Oct 28, 2008"]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.cpp) -AC_CONFIG_HEADERS([src/config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(config) @@ -34,22 +34,11 @@ for file in config/install-sh config/mkinstalldirs ; do 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 - AC_DEFINE(HAVE_KPSEWHICH, 1, - [Define this if you have the kpsewhich program working on your system.]) -fi -AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) +dnl AC_PROG_MAKE_SET +dnl AC_PROG_INSTALL # Check for installed python -AM_PATH_PYTHON(2.3,, :) +AM_PATH_PYTHON(2.3.4,, :) # Work around a problem in automake 1.4: when invoking install-strip, # INSTALL_PROGRAM is changed to 'install -s', and since @@ -59,10 +48,7 @@ INSTALL_SCRIPT='${INSTALL}' ### we will also need a C compiler to compile GNU gettext AC_PROG_CC - -### check for special systems -AC_ISC_POSIX -AC_AIX +AC_USE_SYSTEM_EXTENSIONS ### we need to know the byte order for unicode conversions AC_C_BIGENDIAN @@ -78,13 +64,17 @@ dnl we do not need that currently (and probably all our supported dnl compiler allow that) dnl LYX_CXX_PARTIAL dnl LYX_CXX_EXPLICIT -LYX_CXX_GLOBAL_CSTD +dnl LYX_CXX_GLOBAL_CSTD dnl LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios) dnl LYX_CXX_STL_MODERN_STREAMS +### Objective-C compiler +AC_PROG_OBJC +_AM_DEPENDENCIES([OBJC]) + ### and now some special lyx flags. AC_ARG_ENABLE(assertions, AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, @@ -174,18 +164,6 @@ AC_CHECK_HEADERS(zlib.h, [LYX_LIB_ERROR(zlib.h,zlib)]) -### Check for X libraries -AC_PATH_XTRA -case $have_x in - yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS";; - no) LYX_ERROR(dnl -[Cannot find X window libraries and/or headers. Check your installation. - If you use a Linux system, check that you have installed - the development tools.]);; - disable) ;; -esac - ### check which frontend we want to use dnl The code below is not in a macro, because this would cause big @@ -230,7 +208,12 @@ fi ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) +dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62. +dnl this can be removed if gettext is been updated to avoid that. +m4_undefine([AC_GNU_SOURCE]) +m4_defun([AC_GNU_SOURCE],[]) AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.16.1]) AC_LANG_POP(C) # some standard header files @@ -318,6 +301,7 @@ AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CFLAGS) AC_SUBST(AM_LDFLAGS) +AC_SUBST(real_pkgdatadir) ## Some config.h stuff @@ -394,11 +378,6 @@ char * strerror(int n); ]) -AC_ARG_WITH(qmake, - AC_HELP_STRING([--with-qmake], - [Use qmake instead of automake to generate Makefiles]),, - [with_qmake=no]) - AC_ARG_ENABLE(monolithic-boost, AC_HELP_STRING([--enable-monolithic-boost], [Use monolithic boost compilations]),, @@ -411,12 +390,6 @@ AC_ARG_ENABLE(monolithic-client, [enable_monolithic_client=no]) AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes") -AC_ARG_ENABLE(monolithic-controllers, - AC_HELP_STRING([--enable-monolithic-controllers], - [Use monolithic controllers compilations]),, - [enable_monolithic_controllers=no]) -AM_CONDITIONAL(MONOLITHIC_CONTROLLERS, test "$enable_monolithic_controllers" = "yes") - AC_ARG_ENABLE(monolithic-insets, AC_HELP_STRING([--enable-monolithic-insets], [Use monolithic insets compilations]),, @@ -462,12 +435,15 @@ AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX], AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release]) AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info]) +AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir]) +AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir]) AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number]) AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) -AC_CONFIG_FILES([Makefile +AC_CONFIG_FILES([Makefile \ + lyx.1:lyx.1in \ boost/Makefile \ config/Makefile \ development/Makefile \ @@ -477,7 +453,7 @@ AC_CONFIG_FILES([Makefile development/MacOSX/spotlight/Makefile \ development/lyx.spec \ intl/Makefile \ - lib/Makefile \ + lib/Makefile \ lib/doc/Makefile \ lib/lyx2lyx/lyx2lyx_version.py \ lib/lyx2lyx/Makefile \ @@ -490,39 +466,12 @@ AC_CONFIG_FILES([Makefile src/tex2lyx/Makefile \ src/support/Makefile \ src/frontends/Makefile \ - src/frontends/controllers/Makefile \ src/frontends/qt4/Makefile ]) AC_OUTPUT -if test x$with_qmake = xyes ; then - echo "CONFIGURE WITH QMAKE ONLY" - if test x$srcdir = x ; then - echo "ONLY FOR OUT-OF-TREE-BUILDS POSSIBLE" - else - rm boost/Makefile - rm src/client/Makefile - rm src/Makefile - rm src/tex2lyx/Makefile - rm src/support/Makefile - rm src/frontends/Makefile - rm src/frontends/controllers/Makefile - rm src/frontends/qt4/Makefile - rm -rf boost/.deps - rm -rf src/client/.deps - rm -rf src/.deps - rm -rf src/tex2lyx/.deps - rm -rf src/support/.deps - rm -rf src/frontends/.deps - rm -rf src/frontends/controllers/.deps - rm -rf src/frontends/qt4/.deps - ${srcdir}/development/qmake/doit - fi -fi - - # show version information echo printf "$VERSION_INFO"