Get the right multithread option for GCC 3.0 and later. (#67583)

2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* configure.in: Get the right multithread option for GCC 3.0 and
	later. (#67583)

diff --git a/ChangeLog b/ChangeLog
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88effe9..0dfc4c2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * configure.in: Get the right multithread option for GCC 3.0 and
+       later. (#67583)
+
 2002-01-21  Jeffrey Stedfast  <fejj@ximian.com>
 
        * glib/gconvert.c (g_convert_with_fallback): If g_convert fails,

diff --git a/configure.in b/configure.in
index c691d7b..fd48737 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1125,7 +1125,13 @@ if test x"$have_threads" != xno; then
        *-aix*)
                G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
                if test x"$GCC" = xyes; then
-                       G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+                       # GCC 3.0 and above needs -pthread
+                       # GCC 2.x and below needs -mthreads
+                       AC_TRY_COMPILE(,[#if __GNUC__ <= 2
+                                       bail out here
+                                       #endif],
+                               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -pthread", 
+                               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads")
                fi
                ;;
        *-freebsd2.2*)