do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 5b872b432b3d9d0716e04d18c0e555654c3937df..e022616aeb810a18e71f69b286497704b7031e85 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -8,19 +8,16 @@ 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])
-  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
-fi
+lyx_devel_version=no
+lyx_prerelease=no
+case AC_PACKAGE_VERSION in
+  *svn*) 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.";;
+  *pre*|*alpha*)lyx_prerelease=yes
+        echo "WARNING: This is a prerelease. Be careful and backup your documents.";;
+esac
 AC_SUBST(lyx_devel_version)])
 
 
@@ -73,6 +70,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.
@@ -81,16 +86,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,
@@ -193,7 +191,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;
@@ -556,8 +554,8 @@ 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: qt3, qt4, gtk],
-  [FRONTENDS="$withval"])
+                           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")