fix writing of tabulars; output the real lyx version number at the top of generated...

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b59377af1bb9ec81b43460d9c6a6b73225f31dc8..f37f8f9c6b7813fb3eabe3466d7bd8956f5979ab 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -210,6 +210,8 @@ if test x$GXX = xyes; then
       3.0*)    CXXFLAGS="$lyx_opt";;
       3.1*)    CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
       3.2*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
+      3.3*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
+      3.4*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
       *)       CXXFLAGS="$lyx_opt";;
     esac
     if test x$enable_debug = xyes ; then
@@ -223,13 +225,6 @@ if test x$GXX = xyes; then
        3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
        *)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
-    if test $lyx_devel_version = yes ; then
-      case $gxx_version in
-         2.95.*) ;;
-         2.96*) ;;
-         *) CXXFLAGS="$CXXFLAGS -Winline";;
-      esac
-    fi
   fi
 fi])dnl
 
@@ -396,6 +391,17 @@ dnl    AC_MSG_RESULT([$with_included_string])
 ])
 
 
+dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
+dnl        be used.
+AC_DEFUN(LYX_USE_INCLUDED_BOOST,[
+       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])],
+           [lyx_cv_with_included_boost=yes])
+       AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
+])
+
 dnl Usage: LYX_CXX_GOOD_STD_STRING : checks whether the C++ compiler
 dnl   has a std::string that is close to the standard. So close that
 dnl   methods not found in "unstandard" std::strings are present here.
@@ -497,75 +503,6 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
     fi
 ])
 
-dnl Usage LYX_PATH_XPM: Checks for xpm library and header
-AC_DEFUN(LYX_PATH_XPM,[
-### Check for Xpm library
-AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm",
-       [LYX_LIB_ERROR(libXpm,Xpm)])
-AC_SUBST(XPM_LIB)
-### Check for Xpm headers
-lyx_cv_xpm_h_location="<xpm.h>"
-AC_CHECK_HEADER(X11/xpm.h,[
-  ac_cv_header_xpm_h=yes
-  lyx_cv_xpm_h_location="<X11/xpm.h>"],[
-AC_CHECK_HEADER(xpm.h,[],[
-LYX_LIB_ERROR(xpm.h,Xpm)])])
-AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location,
-  [define this to the location of xpm.h to be used with #include, e.g. <xpm.h>])
-
-### Test for the header version
-if test $ac_cv_header_xpm_h = yes; then
-  AC_CACHE_CHECK([xpm header version],lyx_cv_xpmversion,
-  [ cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-
-#include XPM_H_LOCATION
-"%%%"lyx_cv_xpmv=XpmVersion;lyx_cv_xpmr=XpmRevision"%%%"
-EOF
-    eval `(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
-      grep '^"%%%"'  2>/dev/null | \
-      sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
-    case "$lyx_cv_xpmr" in
-changequote(,)
-     [0-9]) lyxxpmr_alpha=`echo $lyx_cv_xpmr |tr 123456789 abcdefghi`
-           lyxxpmv_alpha=" (aka 3.$lyx_cv_xpmv$lyxxpmr_alpha)";;
-changequote([,])
-        *) ;;
-    esac
-    lyx_cv_xpmversion="$lyx_cv_xpmv.$lyx_cv_xpmr$lyxxpmv_alpha"
-    rm -f conftest*])
-  XPM_VERSION=${lyx_cv_xpmversion}
-  case "$lyx_cv_xpmr" in
-changequote(,)
-       [789]|[0-9][0-9]*) ;;
-changequote([,])
-       *) LYX_WARNING([Version $lyx_cv_xpmversion of the Xpm library is a bit old.
-   If you experience strange crashes with LyX, try to upgrade
-   to at least version 4.7 (aka 3.4g).
-   If you have installed a newer version of the library, check whether you
-   have an old xpm.h header file in your include path.]);;
-  esac
-fi])
-
-
-dnl Usage: LYX_FUNC_PUTENV_ARGTYPE
-dnl Checks whether putenv() takes 'char const *' or 'char *' as
-dnl argument. This is needed because Solaris 7 (wrongly?) uses 'char *',
-dnl while everybody else uses the former...
-AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE,
-[AC_MSG_CHECKING([type of argument for putenv()])
- AC_CACHE_VAL(lyx_cv_func_putenv_arg,dnl
-  [AC_TRY_COMPILE(dnl
-[#include <cstdlib>],
-[char const * foo = "bar";
- putenv(foo);],dnl
-   [lyx_cv_func_putenv_arg='char const *'],[lyx_cv_func_putenv_arg='char *'])])
- AC_MSG_RESULT($lyx_cv_func_putenv_arg)
- AC_DEFINE_UNQUOTED(PUTENV_TYPE_ARG,$lyx_cv_func_putenv_arg,dnl
-   [Define to the type of the argument of putenv(). Needed on Solaris 7.])])
-
-
 dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value,
 dnl                       [default-yes-value])
 dnl  Adds a --with-'dir-name' option (described by 'desc') and puts the