Changed GCC version test to also accept major versions > 2. Thanks to Ben

2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* configure.in: Changed GCC version test to also accept major
	versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
	pointing this out.

diff --git a/ChangeLog b/ChangeLog
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 378c364..903b5b1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2000-02-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Changed GCC version test to also accept major
+       versions > 2. Thanks to Ben Gertzfield <che@debian.org> for
+       pointing this out.
+
 Thu Feb 17 12:53:44 2000  Tim Janik  <timj@gtk.org>
 
         * gstring.c: changed g_str_hash() to a 31 bit version based on

diff --git a/configure.in b/configure.in
index 0a43716..70ff7aa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1350,7 +1350,7 @@ $ac_cv_sizeof_long_long)
   guint64_format='"'$glib_cv_long_long_format'u"'
   glib_extension='G_GNUC_EXTENSION '
   glib_warning_guard="
-#if defined (__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 8
+#if defined (__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
 #  define G_GNUC_EXTENSION __extension__
 #else
 #  define G_GNUC_EXTENSION