]> git.lyx.org Git - lyx.git/blobdiff - config/lyxinclude.m4
Fix nasty memory bug signalled by valgrind while looking at another bug.
[lyx.git] / config / lyxinclude.m4
index 7f887491bea2c9f3598c7c39ad3afe111e28ce21..05a69d6c8e509e070d5869b5e7ada5fa70892258 100644 (file)
@@ -8,19 +8,30 @@ dnl Usage LYX_CHECK_VERSION   Displays version of LyX being built and
 dnl sets variables "lyx_devel_version" and "lyx_prerelease"
 AC_DEFUN([LYX_CHECK_VERSION],[
 echo "configuring LyX version" AC_PACKAGE_VERSION
-if echo AC_PACKAGE_VERSION | grep 'svn' >/dev/null ; then
-  lyx_devel_version=yes
-  AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
-  LYX_DATE="not released yet"
-  echo "WARNING: This is a development version. Expect bugs."
-else
-  lyx_devel_version=no
-fi
-if echo AC_PACKAGE_VERSION | grep 'pre' > /dev/null ; then
-    lyx_prerelease=yes
-    echo "WARNING: This is a prerelease. Be careful and backup your documents."
-else
-    lyx_prerelease=no
+lyx_devel_version=no
+lyx_prerelease=no
+build_type=release
+AC_MSG_CHECKING([for build type])
+AC_ARG_ENABLE(build-type,
+  AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=dev(elopment), rel(ease) or pre(release)]),
+  [case $enableval in
+    dev*) lyx_devel_version=yes
+          build_type=development;;
+    pre*) lyx_prerelease=yes
+          build_type=prerelease;;
+    rel*) ;;
+    *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of dev(elopment), rel(ease) or pre(release)]);;
+   esac],
+  [case AC_PACKAGE_VERSION in
+    *svn*) lyx_devel_version=yes
+          build_type=development;;
+    *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes
+          build_type=prerelease;;
+   esac])
+AC_MSG_RESULT([$build_type])
+if test $lyx_devel_version = yes ; then
+           AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
+           LYX_DATE="not released yet"
 fi
 AC_SUBST(lyx_devel_version)])
 
@@ -33,13 +44,13 @@ AC_MSG_CHECKING([for version suffix])
 dnl We need the literal double quotes in the rpm spec file
 RPM_VERSION_SUFFIX='""'
 AC_ARG_WITH(version-suffix,
-  [  --with-version-suffix[=<version>]  install lyx files as lyx<version>],
+  [AC_HELP_STRING([--with-version-suffix@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-AC_PACKAGE_VERSION))],
   [if test "x$withval" = "xyes";
    then
      withval="-"AC_PACKAGE_VERSION
-     ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
+     ac_configure_args=`echo "$ac_configure_args" | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
    fi
-   version_suffix=$withval
+   AC_SUBST(version_suffix,$withval)
    RPM_VERSION_SUFFIX="--with-version-suffix=$withval"])
 AC_SUBST(RPM_VERSION_SUFFIX)
 AC_MSG_RESULT([$withval])
@@ -160,6 +171,7 @@ fi
 AC_MSG_RESULT($CXX)
 
 AC_PROG_CXX
+AC_PROG_CXXCPP
 
 ### We might want to get or shut warnings.
 AC_ARG_ENABLE(warnings,
@@ -171,9 +183,6 @@ AC_ARG_ENABLE(warnings,
     fi;])
 if test x$enable_warnings = xyes ; then
   lyx_flags="warnings $lyx_flags"
-  AC_DEFINE(WITH_WARNINGS, 1,
-  [Define this if you want to see the warning directives put here and
-   there by the developpers to get attention])
 fi
 
 ### We might want to disable debug
@@ -195,7 +204,7 @@ AC_ARG_ENABLE(stdlib-debug,
 
 AC_ARG_ENABLE(concept-checks,
   AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
-  [ if test $lyx_devel_version = yes -o $lyx-prerelease = yes ; then
+  [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
        enable_concept_checks=yes;
     else
         enable_concept_checks=no;
@@ -222,9 +231,24 @@ esac
 
 AC_ARG_ENABLE(pch,
   AC_HELP_STRING([--enable-pch],[enable precompiled headers]),,
-       enable_pch=yes;)
+       enable_pch=no;)
 lyx_pch_comp=no
 
+AC_ARG_ENABLE(assertions,
+  AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
+  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+       enable_assertions=yes;
+    else
+       enable_assertions=no;
+    fi;])
+if test "x$enable_assertions" = xyes ; then
+   lyx_flags="assertions $lyx_flags"
+   AC_DEFINE(ENABLE_ASSERTIONS,1,
+    [Define if you want assertions to be enabled in the code])
+fi
+
+
+
 # set the compiler options correctly.
 if test x$GXX = xyes; then
   dnl Useful for global version info
@@ -293,180 +317,30 @@ test "$lyx_pch_comp" = yes && lyx_flags="pch $lyx_flags"
 AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
 ])dnl
 
-
-dnl NOT USED CURRENTLY*************************************
-dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler
-dnl   supports RTTI
-AC_DEFUN([LYX_CXX_RTTI],[
-### Check whether the compiler supports runtime type information
-AC_CACHE_CHECK(whether the C++ compiler supports RTTI,lyx_cv_rtti,
- [AC_TRY_RUN([
-class rtti {
-public:
-   virtual int tag() { return 0; }
-};
-class derived1 : public rtti {
-public:
-    int tag() { return 1; }
-};
-class derived2 : public rtti {
-public:
-    int tag() { return 2; }
-};
-int main() {
-    derived1 * foo1 = new derived1();
-    derived2 * foo2 = new derived2();
-    rtti * bar = foo1;
-    derived1 * bar1 = dynamic_cast<derived1 *>(bar);
-    if (bar1 == 0)
-       exit(1);
-    bar = foo2;
-    bar1 = dynamic_cast<derived1 *>(bar);
-    if (bar1 != 0)
-       exit(1);
-    return 0;
-}
-],lyx_cv_rtti=yes,lyx_cv_rtti=no,lyx_cv_rtti=no)
-])
-if test x$lyx_cv_rtti = xyes ; then
-  AC_DEFINE(HAVE_RTTI, 1,
-   [Define to 1 if your compiler supports runtime type information])
-fi])
-
-
-dnl Usage: LYX_CXX_EXPLICIT : checks whether the C++ compiler
-dnl   understands the "explicit" directive.
-AC_DEFUN([LYX_CXX_EXPLICIT],[
-### Check whether the compiler understands the keyword `explicit'
-AC_CACHE_CHECK(whether the C++ compiler understands explicit,lyx_cv_explicit,
- [AC_TRY_COMPILE([
-class Expl {
-public:
-       explicit Expl() {}
-};],,lyx_cv_explicit=yes,lyx_cv_explicit=no)
-])
-if test $lyx_cv_explicit = no ; then
-  AC_DEFINE(explicit,[ ],
-   [Define to nothing if your compiler does not understand the
-   'explicit' directive])
-fi])
-
-
-dnl NOT USED CURRENTLY*************************************
-dnl Usage: LYX_CXX_STL_STACK : checks whether the C++ compiler
-dnl   has a working stl stack template
-AC_DEFUN([LYX_CXX_STL_STACK],[
-AC_CACHE_CHECK(for broken STL stack template,lyx_cv_broken_stack,
- [AC_TRY_COMPILE([
-#include <stack>
-using std::stack;
-],[
-    stack<int> stakk;
-    stakk.push(0);
-],lyx_cv_broken_stack=no,lyx_cv_broken_stack=yes)
-])
-if test $lyx_cv_broken_stack = yes ; then
-  AC_DEFINE(BROKEN_STL_STACK, 1,
-   [Define if you have the STL from libg++ 2.7.x, where stack<> is not defined
-   correctly])
-fi])
-
-
-dnl Usage: LYX_STD_COUNT : checks wherer the C++ library have a conforming
-dnl    count template, if not the old HP version is assumed.
-AC_DEFUN([LYX_STD_COUNT],[
-AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count,
- [AC_TRY_COMPILE([
-#include <algorithm>
-using std::count;
-int countChar(char * b, char * e, char const c)
-{
-       return count(b, e, c);
-}
-],[
-    char a[] = "hello";
-    int i = countChar(a, a + 5, 'l');
-],lyx_cv_std_count=yes,lyx_cv_std_count=no)
-])
-if test $lyx_cv_std_count = yes ; then
-    AC_DEFINE(HAVE_STD_COUNT, 1,
-    [Define if you have a conforming std::count template, otherwise HP version of count template is assumed.])
-fi])
-
-
-dnl Usage: LYX_CXX_STL_MODERN_STREAMS : checks whether the C++ compiler
-dnl   supports modern STL streams
-AC_DEFUN([LYX_CXX_STL_MODERN_STREAMS],[
-AC_CACHE_CHECK(for modern STL streams,lyx_cv_modern_streams,
- [AC_TRY_COMPILE([
-#include <iostream>
-],[
- std::streambuf * test = std::cerr.rdbuf();
- test->pubsync();
-],lyx_cv_modern_streams=yes,lyx_cv_modern_streams=no)
-])
-if test $lyx_cv_modern_streams = yes ; then
-  AC_DEFINE(MODERN_STL_STREAMS, 1,
-   [Define if you have modern standard-compliant STL streams])
-fi])
-
-
 dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
 dnl        be used.
 AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
+       AC_MSG_CHECKING([whether to use boost included library])
        AC_ARG_WITH(included-boost,
-           [  --with-included-boost  use the boost lib supplied with LyX],
-           [lyx_cv_with_included_boost=$withval
-               AC_MSG_RESULT([$with_included_boost])],
+           [AC_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
+           [lyx_cv_with_included_boost=$withval],
            [lyx_cv_with_included_boost=yes])
        AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
-])
-
-
-dnl NOT USED CURRENTLY*************************************
-dnl LYX_CXX_PARTIAL
-AC_DEFUN([LYX_CXX_PARTIAL], [
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_CACHE_CHECK([if C++ compiler supports partial specialization],
-       [lyx_cv_cxx_partial_specialization],
-       [AC_TRY_COMPILE(
-           [
-           template<class T, class K>
-           class k {
-           public:
-           };
-           template<class T> class k<void,T> { };
-           ],[
-           k<float, float> b;
-           k<void,void> a;
-           ],[
-           lyx_cv_cxx_partial_specialization=yes
-           ],[
-           lyx_cv_cxx_partial_specialization=no
-           ])
-       ])
-    if test x$lyx_cv_cxx_partial_specialization = xyes ; then
-       AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1,
-       [Defined if your compiler supports partial specialization.])
-    fi
-])
-
-
-dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions
-dnl   are already in the global namespace
-AC_DEFUN([LYX_CXX_GLOBAL_CSTD],[
-    AC_CACHE_CHECK(whether C library functions are already in the global namespace,
-    lyx_cv_cxx_global_cstd,
-    [AC_TRY_COMPILE([
-    #include <cctype>
-    using std::tolower;
-    ],[
-    return 0;
-    ],[lyx_cv_cxx_global_cstd=no],[lyx_cv_cxx_global_cstd=yes])])
-    if test x$lyx_cv_cxx_global_cstd = xyes; then
-       AC_DEFINE(CXX_GLOBAL_CSTD,1,
-       [Define if your C++ compiler puts C library functions in the global namespace])
-    fi
+       AC_MSG_RESULT([$lyx_cv_with_included_boost])
+       if test x$lyx_cv_with_included_boost != xyes ; then
+               AC_CHECK_LIB(boost_signals, main, [lyx_boost_underscore=yes], [], [-lm])
+               AC_CHECK_LIB(boost_signals-mt, main, [lyx_boost_underscore_mt=yes], [], [-lm $LIBTHREAD])
+               if test x$lyx_boost_underscore_mt = xyes ; then
+                       BOOST_MT="-mt"
+               else
+                       BOOST_MT=""
+                       if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then
+                               LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
+                       fi
+               fi
+               AC_SUBST(BOOST_SEP)
+               AC_SUBST(BOOST_MT)
+       fi
 ])
 
 
@@ -475,7 +349,7 @@ dnl                       [default-yes-value])
 dnl  Adds a --with-'dir-name' option (described by 'desc') and puts the
 dnl  resulting directory name in 'dir-var-name'.
 AC_DEFUN([LYX_WITH_DIR],[
-  AC_ARG_WITH($1,[  --with-$1        specify $2])
+  AC_ARG_WITH($1,[AC_HELP_STRING([--with-$1],[specify $2])])
   AC_MSG_CHECKING([for $2])
   if test -z "$with_$3"; then
      AC_CACHE_VAL(lyx_cv_$3, lyx_cv_$3=$4)
@@ -557,9 +431,9 @@ rm -f conftest*])
 AC_DEFUN([LYX_USE_FRONTENDS],
 [AC_MSG_CHECKING([what frontend should be used for the GUI])
 AC_ARG_WITH(frontend,
-  [  --with-frontend=THIS    Use THIS frontend as main GUI:
-                           Possible values: qt4],
-  [FRONTENDS="$withval"])
+  [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI:
+                           Possible values: qt4])],
+  [FRONTENDS="$withval"],[FRONTENDS="qt4"])
 if test "x$FRONTENDS" = x ; then
   AC_MSG_RESULT(none)
   AC_ERROR("Please select a frontend using --with-frontend")
@@ -576,8 +450,8 @@ AC_SUBST(FRONTENDS_PROGS)
 AC_DEFUN([LYX_USE_PACKAGING],
 [AC_MSG_CHECKING([what packaging should be used])
 AC_ARG_WITH(packaging,
-  [  --with-packaging=THIS   Use THIS packaging for installation:
-                           Possible values: posix, windows, macosx],
+  [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation:
+                           Possible values: posix, windows, macosx])],
   [lyx_use_packaging="$withval"], [
   case $host in
     *-apple-darwin*) lyx_use_packaging=macosx ;;
@@ -585,71 +459,49 @@ AC_ARG_WITH(packaging,
                   *) lyx_use_packaging=posix;;
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
+lyx_install_macosx=false
+lyx_install_cygwin=false
+lyx_install_windows=false
 case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
           PACKAGE=LyX${version_suffix}
           default_prefix="/Applications/${PACKAGE}.app"
           bindir='${prefix}/Contents/MacOS'
           libdir='${prefix}/Contents/Resources'
-          datadir='${prefix}/Contents/Resources'
+          datarootdir='${prefix}/Contents/Resources'
           pkgdatadir='${datadir}'
-          mandir='${datadir}/man' ;;
+          mandir='${datadir}/man'
+          lyx_install_macosx=true ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
           PACKAGE=LyX${version_suffix}
           default_prefix="C:/Program Files/${PACKAGE}"
           bindir='${prefix}/bin'
           libdir='${prefix}/Resources'
-          datadir='${prefix}/Resources'
+          datarootdir='${prefix}/Resources'
           pkgdatadir='${datadir}'
-          mandir='${prefix}/Resources/man' ;;
+          mandir='${prefix}/Resources/man'
+          lyx_install_windows=true ;;
     posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
           PACKAGE=lyx${version_suffix}
           program_suffix=$version_suffix
           pkgdatadir='${datadir}/${PACKAGE}'
-          default_prefix=$ac_default_prefix ;;
+          default_prefix=$ac_default_prefix
+          case ${host} in
+          *cygwin*) lyx_install_cygwin=true ;;
+          esac ;;
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
+AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
+AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
+AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
+dnl Next two lines are only for autoconf <= 2.59
+datadir='${datarootdir}'
+AC_SUBST(datarootdir)
 AC_SUBST(pkgdatadir)
 AC_SUBST(program_suffix)
 ])
 
 
-## ------------------------------------------------------------------------
-## Find a file (or one of more files in a list of dirs)
-## ------------------------------------------------------------------------
-##
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    if test -r "$i/$j"; then
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([LYX_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-dnl libtool is only for C, so I must force him
-dnl to find the correct flags for C++
-ac_save_cc=$CC
-ac_save_cflags="$CFLAGS"
-CC=$CXX
-CFLAGS="$CXXFLAGS"
-AC_PROG_LIBTOOL dnl for libraries
-CC=$ac_save_cc
-CFLAGS="$ac_save_cflags"
-])
-
-
 ## ------------------------------------------------------------------------
 ## Check whether mkdir() is mkdir or _mkdir, and whether it takes
 ## one or two arguments.
@@ -676,7 +528,7 @@ fi
 
 
 dnl Set VAR to the canonically resolved absolute equivalent of PATHNAME,
-dnl (which may be a relative path, and need not refer to any existing 
+dnl (which may be a relative path, and need not refer to any existing
 dnl entity).
 
 dnl On Win32-MSYS build hosts, the returned path is resolved to its true
@@ -698,3 +550,44 @@ AC_DEFUN([MSYS_AC_CANONICAL_PATH],
  $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"'
    s?/*$[]??'`
 ])
+
+dnl this is used by the macro blow to general a proper config.h.in entry
+m4_define([LYX_AH_CHECK_DECL],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1),
+  [Define if you have the prototype for function `$1'])])
+
+dnl Check things are declared in headers to avoid errors or warnings.
+dnl Called like LYX_CHECK_DECL(function, header1 header2...)
+dnl Defines HAVE_DECL_{FUNCTION}
+AC_DEFUN([LYX_CHECK_DECL],
+[LYX_AH_CHECK_DECL($1)
+for ac_header in $2
+do
+  AC_MSG_CHECKING([if $1 is declared by header $ac_header])
+  AC_EGREP_HEADER($1, $ac_header,
+      [AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DECL_$1))
+       break],
+      [AC_MSG_RESULT(no)])
+done])
+
+dnl Extract the single digits from PACKAGE_VERSION and make them available.
+dnl Defines LYX_MAJOR_VERSION, LYX_MINOR_VERSION, LYX_RELEASE_LEVEL,
+dnl LYX_RELEASE_PATCH (possibly equal to 0), LYX_DIR_VER, and LYX_USERDIR_VER.
+AC_DEFUN([LYX_SET_VERSION_INFO],
+[lyx_major=`echo $PACKAGE_VERSION | sed -e 's/[[.]].*//'`
+ lyx_patch=`echo $PACKAGE_VERSION | sed -e "s/^$lyx_major//" -e 's/^.//'`
+ lyx_minor=`echo $lyx_patch | sed -e 's/[[.]].*//'`
+ lyx_patch=`echo $lyx_patch | sed -e "s/^$lyx_minor//" -e 's/^.//'`
+ lyx_release=`echo $lyx_patch | sed -e 's/[[^0-9]].*//'`
+ lyx_patch=`echo $lyx_patch | sed -e "s/^$lyx_release//" -e 's/^[[.]]//' -e 's/[[^0-9]].*//'`
+ test "x$lyx_patch" = "x" && lyx_patch=0
+ lyx_dir_ver=LYX_DIR_${lyx_major}${lyx_minor}x
+ lyx_userdir_ver=LYX_USERDIR_${lyx_major}${lyx_minor}x
+ AC_SUBST(LYX_MAJOR_VERSION,$lyx_major)
+ AC_SUBST(LYX_MINOR_VERSION,$lyx_minor)
+ AC_SUBST(LYX_RELEASE_LEVEL,$lyx_release)
+ AC_SUBST(LYX_RELEASE_PATCH,$lyx_patch)
+ AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver")
+ AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
+])