See Changelog patch in attached diff for details.  This patch selects the correct 
compiler flags for compiling libgc with pthreads on FreeBSD.

jmc
Index: ChangeLog
===================================================================
RCS file: /cvs/public/libgc/ChangeLog,v
retrieving revision 1.44.2.1
diff -u -r1.44.2.1 ChangeLog
--- ChangeLog   2 Jul 2004 15:21:55 -0000       1.44.2.1
+++ ChangeLog   28 Jul 2004 03:06:25 -0000
@@ -1,3 +1,7 @@
+2004-07-27  John Merryweather Cooper <[EMAIL PROTECTED]>
+       # configure.in: Fix compiler flags selection to be correct for
+       both FreeBSD 4.x (aka -STABLE) and FreeBSD 5.x (aka -CURRENT).
+       
 2004-07-01  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * include/install-sh doc/install-sh: New files.
Index: configure.in
===================================================================
RCS file: /cvs/public/libgc/configure.in,v
retrieving revision 1.20
diff -u -r1.20 configure.in
--- configure.in        19 May 2004 16:18:32 -0000      1.20
+++ configure.in        28 Jul 2004 03:06:26 -0000
@@ -98,11 +98,31 @@
        AC_DEFINE(THREAD_LOCAL_ALLOC)
        THREADLIBS="-lpthread -lrt"
        ;;
-     *-*-freebsd*)
+     *-*-freebsd4*)
        AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
        AC_DEFINE(GC_FREEBSD_THREADS)
-       INCLUDES="$INCLUDES -pthread"
-       THREADLIBS=-pthread
+       if test "x$PTHREAD_CFLAGS" = "x"; then
+               INCLUDES="$INCLUDES -pthread"
+       else
+               INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+       fi
+       if test "x$PTHREAD_LIBS" = "x"; then
+               THREADLIBS=-pthread
+       else
+               THREADLIBS="$PTHREAD_LIBS"
+       fi
+       ;;
+     *-*-freebsd5*)
+       AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
+       AC_DEFINE(GC_FREEBSD_THREADS)
+       if test "x$PTHREAD_CFLAGS" != "x"; then
+               INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
+       fi
+       if test "x$PTHREAD_LIBS" = "x"; then
+               THREADLIBS=-lpthread
+       else
+               THREADLIBS="$PTHREAD_LIBS"
+       fi
        ;;
      *-*-solaris*)
        AC_DEFINE(GC_SOLARIS_THREADS)

Attachment: pgpwOONJ6VP2t.pgp
Description: PGP signature



Reply via email to