Keep score of how many #includes have been removed.

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 8d79706a66881e0c638bf05eadda537a056a7ffc..21671420f71fc4c586a8fe05fd4e403e57be403c 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -162,7 +162,7 @@ AC_PROG_CXX
 
 ### We might want to get or shut warnings.
 AC_ARG_ENABLE(warnings,
-  [  --enable-warnings       tell the compiler to display more warnings],,
+  AC_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),,
   [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
        enable_warnings=yes;
     else
@@ -177,7 +177,7 @@ fi
 
 ### We might want to disable debug
 AC_ARG_ENABLE(debug,
-  [  --enable-debug          enable debug information],,
+  AC_HELP_STRING([--enable-debug],[enable debug information]),,
   [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
        enable_debug=yes;
     else
@@ -186,7 +186,7 @@ AC_ARG_ENABLE(debug,
 
 ### set up optimization
 AC_ARG_ENABLE(optimization,
-  [  --enable-optimization[=value]   enable compiler optimisation],,
+  AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
        enable_optimization=yes;)
 case $enable_optimization in
   yes) lyx_opt=-O;;
@@ -211,6 +211,7 @@ if test x$GXX = xyes; then
       3.1*)    CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
       3.2*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
       3.3*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
+      3.4*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
       *)       CXXFLAGS="$lyx_opt";;
     esac
     if test x$enable_debug = xyes ; then
@@ -224,13 +225,6 @@ if test x$GXX = xyes; then
        3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
        *)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
-    if test $lyx_devel_version = yes ; then
-      case $gxx_version in
-         2.95.*) ;;
-         2.96*) ;;
-         *) CXXFLAGS="$CXXFLAGS -Winline";;
-      esac
-    fi
   fi
 fi])dnl
 
@@ -591,20 +585,18 @@ rm -f conftest*])
 ])
 ### end of LYX_PATH_HEADER
 
-### Check which frontend we want to use. The default is XForms
+### Check which frontends we want to use. The default is XForms only
 ###
-AC_DEFUN(LYX_USE_FRONTEND,
-[AC_MSG_CHECKING([what frontend should be used as main GUI])
+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],
-  [lyx_use_frontend="$withval"], [lyx_use_frontend="xforms"])
-AC_MSG_RESULT($lyx_use_frontend)
-AC_SUBST(FRONTEND)
-AC_SUBST(FRONTEND_GUILIB)
-AC_SUBST(FRONTEND_LDFLAGS)
-AC_SUBST(FRONTEND_INCLUDES)
-AC_SUBST(FRONTEND_LIBS)
+  [FRONTENDS="$withval"], [FRONTENDS="xforms"])
+AC_MSG_RESULT($FRONTENDS)
+AC_SUBST(FRONTENDS)
+AC_SUBST(FRONTENDS_SUBDIRS)
+AC_SUBST(FRONTENDS_PROGS)
 ])