X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=38b20870b4308519b5f09efc33ee51fcd8d1c529;hb=6b5ce8a999028cefcf47a127ec5e8384f24d13dd;hp=e1d5ef5f781139b7b3279158f4c3b85a194856e3;hpb=8e988ba702af5562d3b6c06ff6ea49e59eb8e4e2;p=lyx.git diff --git a/configure.ac b/configure.ac index e1d5ef5f78..38b20870b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,11 @@ 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_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx]) +# Use ISO format only. The frontend needs to parse this +AC_SUBST(LYX_DATE, ["2009-03-25"]) 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) @@ -18,7 +19,7 @@ LYX_USE_PACKAGING # 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 +dnl Default maintainer mode to true for development versions if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi @@ -34,22 +35,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 +49,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 +65,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]),, @@ -123,6 +114,25 @@ AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi]) AC_SUBST(LIBSHLWAPI) AC_CHECK_LIB(gdi32, main) +AC_ARG_WITH(mythes, + [ --without-mythes do not use the MyThes library], + [lyx_use_mythes=$withval]) +if test x$lyx_use_mythes != xno; then +AC_CHECK_LIB(mythes, main, + [AC_DEFINE(HAVE_LIBMYTHES,1,[Define this if you have the MyThes library]) + MYTHES_LIBS="-lmythes" + lyx_flags="mythes $lyx_flags" + ]) +AC_CHECK_HEADER(mythes.hxx,[ + ac_cv_header_mythes_h=yes + lyx_cv_mythes_h_location=""]) +AC_CHECK_HEADER(mythes/mythes.hxx,[ + ac_cv_header_mythes_h=yes + lyx_cv_mythes_h_location=""]) +AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx]) +fi +AC_SUBST(MYTHES_LIBS) + AC_ARG_WITH(aiksaurus, [ --without-aiksaurus do not use the Aiksaurus library], [lyx_use_aiksaurus=$withval]) @@ -147,18 +157,6 @@ LYX_USE_INCLUDED_BOOST # Needed for our char_type AC_CHECK_SIZEOF(wchar_t) -### Setup libtool -dnl Dirty trick ahead: disable libtool checking for a fortran compiler -dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699 -dnl Note that this will reportedly not be needed with libtool 2.0 -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) -#AC_DISABLE_SHARED -AC_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -#AM_PROG_LIBTOOL -LYX_PROG_LIBTOOL - ### We need iconv for unicode support (Qt4 frontend requires it too) AM_ICONV if test "$am_cv_func_iconv" = no; then @@ -173,18 +171,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 @@ -229,13 +215,18 @@ 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 AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h utime.h sys/utime.h) # some standard structures AC_HEADER_STAT @@ -311,19 +302,13 @@ ${FRONTEND_INFO}\ LyX binary dir: ${real_bindir}\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) 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) +AC_SUBST(real_pkgdatadir) ## Some config.h stuff @@ -373,6 +358,7 @@ char * strerror(int n); #define BOOST_NO_WSTRING 1 #ifdef __CYGWIN__ +# define NOMINMAX # define BOOST_POSIX 1 # define BOOST_POSIX_API 1 # define BOOST_POSIX_PATH 1 @@ -399,27 +385,51 @@ char * strerror(int n); #endif ]) - -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]),, - [enable_monolithic_boost=no]) -AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes) +m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4]) +AC_ARG_ENABLE(monolithic-build, + AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@], + [Use monolithic build for modules in LIST (default: ALLPARTS)]), + [test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS" + test "$enable_monolithic_build" = no && enable_monolithic_build= + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ," + for i in $enable_monolithic_build ; do + eval "enable_monolithic_$i=yes" + done + IFS="$ac_save_ifs"], + [enable_monolithic_build=]) + +AM_CONDITIONAL(MONOLITHIC_BOOST, test -n "$enable_monolithic_boost") +AM_CONDITIONAL(MONOLITHIC_CLIENT, test -n "$enable_monolithic_client") +AM_CONDITIONAL(MONOLITHIC_INSETS, test -n "$enable_monolithic_insets") +AM_CONDITIONAL(MONOLITHIC_MATHED, test -n "$enable_monolithic_mathed") +AM_CONDITIONAL(MONOLITHIC_CORE, test -n "$enable_monolithic_core") +AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test -n "$enable_monolithic_tex2lyx") +AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test -n "$enable_monolithic_frontend_qt4") + +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_DEFINE_UNQUOTED([LYX_ABS_TOP_SRCDIR], + "${lyx_abs_top_srcdir}", [Top source directory]) +AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_LOCALEDIR], + "${lyx_abs_installed_localedir}",[Hard coded locale directory]) +AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_DATADIR], + "${lyx_abs_installed_datadir}",[Hard system support directory]) +AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX], + "${version_suffix}",[Program version 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 \ @@ -438,43 +448,18 @@ AC_CONFIG_FILES([Makefile sourcedoc/Doxyfile \ sourcedoc/Makefile \ src/client/Makefile \ + src/client/lyxclient.1:src/client/lyxclient.1in \ src/Makefile \ src/tex2lyx/Makefile \ + src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \ 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"