glib-2.0.m4 patch

[Eric Lemings <eric b lemings lmco com>]

Put AC_MSG_CHECKING for pkg-config and glib in the right order.
Set CXXFLAGS same as CFLAGS when using C++ compiler.
--- glib-2.0.m4.orig    Thu Apr 12 13:22:34 2001
+++ glib-2.0.m4 Thu Apr 12 13:27:52 2001
@@ -29,7 +29,6 @@
   done

   min_glib_version=ifelse([$1], ,1.3.3,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)

   no_glib=""

@@ -46,6 +45,7 @@
   fi

   if test x"$no_glib" = x ; then
+    AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
     GLIB_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
     GLIB_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
     glib_config_major_version=`$PKG_CONFIG glib-2.0 --modversion | \
@@ -56,8 +56,10 @@
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     if test "x$enable_glibtest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
+      ac_save_CXXFLAGS="$CXXFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      CXXFLAGS="$CXXFLAGS $GLIB_CFLAGS"
       LIBS="$GLIB_LIBS $LIBS"
 dnl
 dnl Now check if the installed GLIB is sufficiently new. (Also sanity
@@ -137,6 +139,7 @@
 }
 ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
+       CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
@@ -154,6 +157,7 @@
        else
           echo "*** Could not run GLIB test program, checking why..."
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           AC_TRY_LINK([
 #include <glib.h>
@@ -178,6 +182,7 @@
           echo "*** or that you have moved GLIB since it was installed.
In the latter cas
e, you"
           echo "*** may want to edit the pkg-config script:
$PKG_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"
        fi
      fi