mhoyt 2004/03/03 07:06:39
Modified: c Makefile.incl.in runConfigure
c/samples runConfigure
Log:
Patch for Bugzilla 27406 from Bjoern A. Zeeb: FreeBSD threading configuration
Revision Changes Path
1.15 +1 -1 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.incl.in 26 Feb 2004 23:10:06 -0000 1.14
+++ Makefile.incl.in 3 Mar 2004 15:06:38 -0000 1.15
@@ -190,7 +190,7 @@
ifdef XALAN_USE_ICU
LD_RPATH_PRE = -Wl,-rpath,
PLATFORM_LIB_LINK_OPTIONS = $(LD_RPATH_PRE)${ICUROOT}/lib
- PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata -lgcc
+ PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata
ALLLIBS += -L${ICUROOT}
endif
1.9 +10 -1 xml-xalan/c/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/runConfigure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- runConfigure 26 Feb 2004 23:10:06 -0000 1.8
+++ runConfigure 3 Mar 2004 15:06:39 -0000 1.9
@@ -17,6 +17,9 @@
#
#
# $Log$
+# Revision 1.9 2004/03/03 15:06:39 mhoyt
+# Patch for Bugzilla 27406 from Bjoern A. Zeeb: FreeBSD threading
configuration
+#
# Revision 1.8 2004/02/26 23:10:06 mhoyt
# Update to Apache 2.0 License
#
@@ -447,7 +450,13 @@
elif test $platform = "aix"; then
threadingLibs="-lpthreads"
elif test $platform = "freebsd"; then
- threadingLibs="-pthread -lc_r"
+ if test -n "${PTHREAD_LIBS}" ; then
+ threadingLibs="${PTHREAD_LIBS}"
+ threadingDefines="${PTHREAD_CFLAGS}"
+ else
+ threadingLibs="-lpthread"
+ threadingDefines=""
+ fi
elif test $platform = "netbsd"; then
threadingLibs="-pthread -lpthread"
elif test $platform = "os400"; then
1.4 +7 -1 xml-xalan/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/runConfigure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- runConfigure 26 Feb 2004 22:27:24 -0000 1.3
+++ runConfigure 3 Mar 2004 15:06:39 -0000 1.4
@@ -292,7 +292,13 @@
elif test $platform = "aix"; then
threadingLibs="-lpthreads"
elif test $platform = "freebsd"; then
- threadingLibs="-pthread -lc_r"
+ if test -n "${PTHREAD_LIBS}" ; then
+ threadingLibs="${PTHREAD_LIBS}"
+ threadingDefines="${PTHREAD_CFLAGS}"
+ else
+ threadingLibs="-lpthread"
+ threadingDefines=""
+ fi
elif test $platform = "netbsd"; then
threadingLibs="-pthread -lpthread"
elif test $platform = "hp-10"; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
