X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=eb60d86259197b247b459962d9fbb24d2b66b208;hb=2debd7d78034a4575d19012392de49ef96b256d6;hp=35344d78ad95e924485258eab31ac8c8de09a616;hpb=60c73c05a3de15ac17350a7c9a73388bd4cd4f89;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 35344d78ad..eb60d86259 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -10,14 +10,29 @@ AC_DEFUN([LYX_CHECK_VERSION],[
 echo "configuring LyX version" AC_PACKAGE_VERSION
 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*|*beta*|*rc*) lyx_prerelease=yes
-        echo "WARNING: This is a prerelease. Be careful and backup your documents.";;
-esac
+build_type=release
+AC_MSG_CHECKING([for build type])
+AC_ARG_ENABLE(build-type,
+  AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=dev(elopment), rel(ease) or pre(release)]),
+  [case $enableval in
+    dev*) lyx_devel_version=yes
+          build_type=development;;
+    pre*) lyx_prerelease=yes
+          build_type=prerelease;;
+    rel*) ;;
+    *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of dev(elopment), rel(ease) or pre(release)]);;
+   esac],
+  [case AC_PACKAGE_VERSION in
+    *svn*) lyx_devel_version=yes
+          build_type=development;;
+    *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes
+          build_type=prerelease;;
+   esac])
+AC_MSG_RESULT([$build_type])
+if test $lyx_devel_version == yes ; then
+           AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
+           LYX_DATE="not released yet"
+fi
 AC_SUBST(lyx_devel_version)])
 
 
@@ -156,6 +171,7 @@ fi
 AC_MSG_RESULT($CXX)
 
 AC_PROG_CXX
+AC_PROG_CXXCPP
 
 ### We might want to get or shut warnings.
 AC_ARG_ENABLE(warnings,
@@ -215,7 +231,7 @@ esac
 
 AC_ARG_ENABLE(pch,
   AC_HELP_STRING([--enable-pch],[enable precompiled headers]),,
-	enable_pch=yes;)
+	enable_pch=no;)
 lyx_pch_comp=no
 
 # set the compiler options correctly.
@@ -407,12 +423,13 @@ fi])
 dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
 dnl        be used.
 AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
+	AC_MSG_CHECKING([whether to use boost included library])
 	AC_ARG_WITH(included-boost,
 	    [  --without-included-boost  do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found],
-	    [lyx_cv_with_included_boost=$withval
-		AC_MSG_RESULT([$with_included_boost])],
+	    [lyx_cv_with_included_boost=$withval],
 	    [lyx_cv_with_included_boost=yes])
 	AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
+	AC_MSG_RESULT([$lyx_cv_with_included_boost])
 ])
 
 
@@ -587,7 +604,7 @@ case $lyx_use_packaging in
 	   libdir='${prefix}/Contents/Resources'
 	   datadir='${prefix}/Contents/Resources'
 	   pkgdatadir='${datadir}'
-	   mandir='${datadir}/man' 
+	   mandir='${datadir}/man'
 	   lyx_install_macosx=true ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
 	   PACKAGE=LyX${version_suffix}
@@ -672,7 +689,7 @@ fi
 
 
 dnl Set VAR to the canonically resolved absolute equivalent of PATHNAME,
-dnl (which may be a relative path, and need not refer to any existing 
+dnl (which may be a relative path, and need not refer to any existing
 dnl entity).
 
 dnl On Win32-MSYS build hosts, the returned path is resolved to its true