[mono-list] Patch to mono-1-0 Mono for approval -- libgc/configure.in

[John Merryweather Cooper]

--wq9mPyueHGvFACwf
Content-Type: multipart/mixed; boundary="bp/iNruPH9dso1Pn"
Content-Disposition: inline


--bp/iNruPH9dso1Pn
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline

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

jmc

--bp/iNruPH9dso1Pn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="file.diff.1d7h1q"
Content-Transfer-Encoding: quoted-printable

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 <john_m_cooper@yahoo.com>
+	# configure.in: Fix compiler flags selection to be correct for
+	both FreeBSD 4.x (aka -STABLE) and FreeBSD 5.x (aka -CURRENT).
+=09
 2004-07-01  Zoltan Varga  <vargaz@freemail.hu>
=20
 	* include/install-sh doc/install-sh: New files.
Index: configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D"-lpthread -lrt"
 	;;
-     *-*-freebsd*)
+     *-*-freebsd4*)
 	AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
 	AC_DEFINE(GC_FREEBSD_THREADS)
-	INCLUDES=3D"$INCLUDES -pthread"
-	THREADLIBS=3D-pthread
+	if test "x$PTHREAD_CFLAGS" =3D "x"; then
+		INCLUDES=3D"$INCLUDES -pthread"
+	else
+		INCLUDES=3D"$INCLUDES $PTHREAD_CFLAGS"
+	fi
+	if test "x$PTHREAD_LIBS" =3D "x"; then
+		THREADLIBS=3D-pthread
+	else
+		THREADLIBS=3D"$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" !=3D "x"; then
+		INCLUDES=3D"$INCLUDES $PTHREAD_CFLAGS"
+	fi
+	if test "x$PTHREAD_LIBS" =3D "x"; then
+		THREADLIBS=3D-lpthread
+	else
+		THREADLIBS=3D"$PTHREAD_LIBS"
+	fi
       	;;
      *-*-solaris*)
 	AC_DEFINE(GC_SOLARIS_THREADS)

--bp/iNruPH9dso1Pn--

--wq9mPyueHGvFACwf
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFBByb3vBSBfjNhsrIRAtbjAJwJ1f/RcQ9mdnzj5hMGOsKsUUD0rwCfYH+K
Ku8PASBqlVaPhAwcBG6y9kI=
=sCIo
-----END PGP SIGNATURE-----

--wq9mPyueHGvFACwf--