[patch] make configure only do the required amount of work

[Lars Gullik Bjønnes]

Before this patch the xforms test were run twice if both xforms and
gtk was configured.

This patch changes that.
Also some reformatting and preparing for gcc 3.5 is done.

Please have a look.


Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.21
diff -u -p -r1.21 configure.ac
--- configure.ac	1 Jun 2004 19:50:09 -0000	1.21
+++ configure.ac	25 Jul 2004 00:57:32 -0000
@@ -164,15 +164,16 @@ dnl problems with the AC_REQUIRE contain
 for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
-	  XFORMS_DO_IT_ALL
+	  [ x$gtk_done = x1 ] || XFORMS_DO_IT_ALL
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+	  [ x$gtk_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
 	  RPM_FRONTEND="xforms"
 	  RPM_FRONTEND_DEPS='libforms >= 1.0'
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
       libXpm version:\t\t${XPM_VERSION}\n\
       libforms version:\t\t${XFORMS_VERSION}\n"
+	  xforms_done=1
 	  ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -187,10 +188,11 @@ for frontend in $FRONTENDS ; do
   dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
   dnl	;;
     gtk)
-	  XFORMS_DO_IT_ALL
+	  [ x$xforms_done = x1 ] || XFORMS_DO_IT_ALL
 	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk"
+	  [ x$xforms_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
 	  RPM_FRONTEND="gtk"
 	  RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
 	  GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
@@ -199,6 +201,7 @@ for frontend in $FRONTENDS ; do
   GTK Frontend:\n\
     libgtkmm version:\t\t${GTKMM_VERSION}\n\
     libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
+	  gtk_done=1
 	  ;;
 
     qt)
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.92
diff -u -p -r1.92 lyxinclude.m4
--- config/lyxinclude.m4	25 May 2004 14:42:09 -0000	1.92
+++ config/lyxinclude.m4	25 Jul 2004 00:57:32 -0000
@@ -217,7 +217,7 @@ if test x$GXX = xyes; then
     esac
     if test x$enable_debug = xyes ; then
 	case $gxx_version in
-	    3.4*) CXXFLAGS="-g $CXXFLAGS"
+	    3.4*|3.5*) CXXFLAGS="-g $CXXFLAGS"
 		AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
 		AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
 		;;
@@ -229,9 +229,10 @@ if test x$GXX = xyes; then
     case $gxx_version in
 	2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
 	2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
-	3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
-	3.4*)   CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
-	*)      CXXFLAGS="$CXXFLAGS -W -Wall";;
+	3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+	3.2*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+	3.3*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+	*)    CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
     esac
   fi
 fi])dnl

-- 
        Lgb