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
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.
$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,
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*)
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
;;
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])
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])
;;
])
### 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)