Make the test for VARARGS macros more robust, fixing problem with

Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Make the test for VARARGS macros
        more robust, fixing problem with misbehaving
        IRIX compiler that doesn't error on #error.
        (#90267)

7 files changed, 50 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 9bbf4fb6..209d9c05 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Tue Aug 20 16:06:36 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Make the test for VARARGS macros
+	more robust, fixing problem with misbehaving
+	IRIX compiler that doesn't error on #error.
+	(#90267)
+
 Tue Aug 20 15:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/indic-ot.c (getOutputIndex)
diff --git a/configure.in b/configure.in
index a98d3ddd..23eae450 100644
--- a/configure.in
+++ b/configure.in
@@ -325,15 +325,19 @@ fi
 # The OpenType test programs aren't particularly portable
 #
 have_varargs=no
+pango_saved_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
 AC_MSG_CHECKING(Whether to build OpenType test programs)
-pango_save_cppflags="$CPPFLAGS"
-AC_TRY_COMPILE([#include <glib.h>],[
-#if !(defined(G_HAVE_ISO_VARARGS) || defined(G_HAVE_GNUC_VARARGS))
-#error "No varargs macro definitions"
+AC_EGREP_CPP(pango_configure_test_yes, [
+#include <glib.h>
+
+#if defined(G_HAVE_ISO_VARARGS) || defined(G_HAVE_GNUC_VARARGS)
+pango_configure_test_yes
 #endif
 ],have_varargs=yes)
 AC_MSG_RESULT($have_varargs)
 AM_CONDITIONAL(BUILD_OT_TESTS, test $have_varargs = yes)
+CPPFLAGS=$pango_saved_cppflags
 
 #
 # Allow building some or all modules included