X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8ae4fd1d26c30a6ba21323b6a9fe87451c9885f3;hb=f892153562285a4cc931f3a28c1b09db37baf2e0;hp=a77234c7dfb2af7ac72348ced26914e113dc7a2b;hpb=ac28bcc93fd3085f5a680a7ad76b0da5f7ad1021;p=lyx.git diff --git a/configure.ac b/configure.ac index a77234c7df..8ae4fd1d26 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.0beta1,[lyx-devel@lists.lyx.org],[lyx]) -AC_SUBST(LYX_DATE, ["Fri, May 29, 2008"]) +AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx]) +AC_SUBST(LYX_DATE, ["Sat, Nov 15, 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) @@ -33,26 +33,12 @@ for file in config/install-sh config/mkinstalldirs ; do chmod 755 ${srcdir}/${file} done -### Provide a dummy POTFILES.in in po in order to mark it as a PO directory -test -f ${srcdir}/po/POTFILES.in || touch ${srcdir}/po/POTFILES.in - ### 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 @@ -62,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 @@ -130,6 +113,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]) @@ -154,19 +156,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 @@ -181,18 +170,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 @@ -237,7 +214,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 @@ -325,6 +307,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 @@ -401,11 +384,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]),, @@ -463,12 +441,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 \ @@ -497,30 +478,6 @@ AC_CONFIG_FILES([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/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/qt4/.deps - ${srcdir}/development/qmake/doit - fi -fi - - # show version information echo printf "$VERSION_INFO"