Small fixes for STLPort compliance

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 0def2730d3c3b427b7f810629857ed79d78c1f62..0a5bfe0d97b6b739321723799bdfe460406339e3 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -11,6 +11,7 @@ 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
@@ -29,6 +30,7 @@ dnl
 dnl
 AC_DEFUN([LYX_VERSION_SUFFIX],[
 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>],
@@ -72,6 +74,14 @@ LYX_ERROR([Cannot find $1. Please check that the $2 library
 dnl Usage: LYX_CHECK_ERRORS  Displays a warning message if a LYX_ERROR
 dnl   has occured previously.
 AC_DEFUN([LYX_CHECK_ERRORS],[
+if test x$lyx_warning = xyes; then
+cat <<EOF
+=== The following minor problems have been detected by configure.
+=== Please check the messages below before running 'make'.
+=== (see the section 'Problems' in the INSTALL file)
+$lyx_warning_txt
+EOF
+fi
 if test x$lyx_error = xyes; then
 cat <<EOF
 **** The following problems have been detected by configure.
@@ -80,16 +90,9 @@ cat <<EOF
 $lyx_error_txt
 $lyx_warning_txt
 EOF
+exit 1
 else
 
-if test x$lyx_warning = xyes; then
-cat <<EOF
-=== The following minor problems have been detected by configure.
-=== Please check the messages below before running 'make'.
-=== (see the section 'Problems' in the INSTALL file)
-$lyx_warning_txt
-EOF
-fi
 cat <<EOF
 Configuration of LyX was successful.
 Type 'make' to compile the program,
@@ -242,6 +245,8 @@ if test x$GXX = xyes; then
         CXXFLAGS="-pg $CXXFLAGS"
         LDFLAGS="-pg $LDFLAGS"
     fi
+  fi
+  if test "$ac_env_CPPFLAGS_set" != set; then
     if test x$enable_warnings = xyes ; then
         case $gxx_version in
             3.1*|3.2*|3.3*)
@@ -256,7 +261,7 @@ if test x$GXX = xyes; then
   case $gxx_version in
       3.1*)    AM_CXXFLAGS="-finline-limit=500 ";;
       3.2*|3.3*)    AM_CXXFLAGS="";;
-      3.4*|4.0*)
+      3.4*|4.*)
           AM_CXXFLAGS=""
           test $enable_pch = yes && lyx_pch_comp=yes
           ;;
@@ -264,7 +269,7 @@ if test x$GXX = xyes; then
   esac
   if test x$enable_stdlib_debug = xyes ; then
     case $gxx_version in
-      3.4*|4.0*)
+      3.4*|4.*)
         lyx_flags="stdlib-debug $lyx_flags"
        AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
        AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
@@ -277,7 +282,7 @@ if test x$GXX = xyes; then
         lyx_flags="concept-checks $lyx_flags"
         AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
        ;;
-      3.4*|4.0*)
+      3.4*|4.*)
         lyx_flags="concept-checks $lyx_flags"
        AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
        ;;
@@ -547,13 +552,13 @@ rm -f conftest*])
 ])
 ### end of LYX_PATH_HEADER
 
-### Check which frontends we want to use. The default is XForms only
+### Check which frontends we want to use.
 ###
 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: xforms, qt, gtk(EXPERIMENTAL)],
+                           Possible values: qt3, qt4, gtk],
   [FRONTENDS="$withval"])
 if test "x$FRONTENDS" = x ; then
   AC_MSG_RESULT(none)
@@ -591,7 +596,6 @@ case $lyx_use_packaging in
           mandir='${datadir}/man' ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
           PACKAGE=LyX${version_suffix}
-          program_suffix=$version_suffix
           default_prefix="C:/Program Files/${PACKAGE}"
           bindir='${prefix}/bin'
           libdir='${prefix}/Resources'
@@ -606,6 +610,7 @@ case $lyx_use_packaging in
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
 AC_SUBST(pkgdatadir)
+AC_SUBST(program_suffix)
 ])