* remove various xforms relicts, in particular:

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bf2a2a37d524ff12f42fd6faca319fa6bae93c1f..777e782d216a2ebbf09cf778b1c8f993718a16a5 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -29,6 +29,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>],
@@ -254,10 +255,10 @@ if test x$GXX = xyes; then
     fi
   fi
   case $gxx_version in
-      3.1*)    AM_CXXFLAGS="-finline-limit=500 -fno-exceptions";;
-      3.2*|3.3*)    AM_CXXFLAGS="-fno-exceptions";;
+      3.1*)    AM_CXXFLAGS="-finline-limit=500 ";;
+      3.2*|3.3*)    AM_CXXFLAGS="";;
       3.4*|4.0*)
-          AM_CXXFLAGS="-fno-exceptions"
+          AM_CXXFLAGS=""
           test $enable_pch = yes && lyx_pch_comp=yes
           ;;
       *)       AM_CXXFLAGS="";;
@@ -553,7 +554,7 @@ 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: qt, gtk(EXPERIMENTAL)],
   [FRONTENDS="$withval"])
 if test "x$FRONTENDS" = x ; then
   AC_MSG_RESULT(none)
@@ -591,7 +592,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 +606,7 @@ case $lyx_use_packaging in
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
 AC_SUBST(pkgdatadir)
+AC_SUBST(program_suffix)
 ])