Add support for pthreads under FreeBSD 2.2.[7|8]

Add support for pthreads under FreeBSD 2.2.[7|8]

diff --git a/ChangeLog b/ChangeLog
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ac3f57f..df7dc12 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sun Jan 17 01:06:38 1999 Timur Bakeyev <mc@bat.ru>
+
+       * configure.in: Add support for FreeBSD 2.2.x macro _THREAD_SAFE.
+
 Wed Jan 13 11:27:24 PST 1999 Manish Singh <yosh@gimp.org>
 
        * glib.h: don't use inline for !__GNUC__ case with g_warning,

diff --git a/configure.in b/configure.in
index 4381e03..f678b23 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -673,31 +673,37 @@ dnl determination of G_THREAD_CFLAGS
 dnl ********************************
 
 if test x"$have_threads" != xnone; then
-       G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default
-
-       case $host in
-              *-aix*)
-                       G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-                       if test x"$GCC" = xyes; then 
-                               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
-                       fi
-                       ;;
-       esac
+G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
+
+    case $host in
+       *-aix*)
+               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+               if test x"$GCC" = xyes; then 
+                       G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+               fi
+               ;;
+       *-freebsd2.2*)
+               G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+
+               # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
+               # -mthreads flag.
+               ;;
+    esac
 
-       # if we are not finding the ctime_r function, then we probably are 
-       # not using the proper multithread flag
-       old_CPPFLAGS=$CPPFLAGS
-       CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
-       AC_EGREP_HEADER([[^a-zA-Z_]ctime_r[^a-zA-Z_]], time.h, , 
-               G_THREAD_CFLAGS=
-               AC_MSG_WARN($FLAG_DOES_NOT_WORK))
-       CPPFLAGS=$old_CPPFLAGS
+    # if we are not finding the ctime_r function, then we probably are 
+    # not using the proper multithread flag
+    old_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
+    AC_EGREP_HEADER([[^a-zA-Z_]ctime_r[^a-zA-Z_]], time.h, , 
+    G_THREAD_CFLAGS=
+    AC_MSG_WARN($FLAG_DOES_NOT_WORK))
+    CPPFLAGS=$old_CPPFLAGS
 
-       AC_MSG_CHECKING(necessary compiler options)
+    AC_MSG_CHECKING(necessary compiler options)
 
-       AC_MSG_RESULT($G_THREAD_CFLAGS)
+    AC_MSG_RESULT($G_THREAD_CFLAGS)
 else
-        G_THREAD_CFLAGS=
+    G_THREAD_CFLAGS=
 fi
 
 AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c")