* insetbranch.C (textString): implement, so that branches appear

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 8b301232f3c413bdbfe8e2f5b739c199b231c39c..e022616aeb810a18e71f69b286497704b7031e85 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -8,20 +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])
-  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 | egrep 'pre|alpha' > /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)])
 
 
@@ -195,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;
@@ -559,7 +555,7 @@ AC_DEFUN([LYX_USE_FRONTENDS],
 AC_ARG_WITH(frontend,
   [  --with-frontend=THIS    Use THIS frontend as main GUI:
                            Possible values: qt4],
-  [FRONTENDS="$withval"])
+  [FRONTENDS="$withval"],[FRONTENDS="qt4"])
 if test "x$FRONTENDS" = x ; then
   AC_MSG_RESULT(none)
   AC_ERROR("Please select a frontend using --with-frontend")