Author: jberry
Date: Fri May 27 17:16:47 2005
New Revision: 178846
URL: http://svn.apache.org/viewcvs?rev=178846&view=rev
Log:
Added libs must be added globally, not just for the specific convenience library
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Fri May 27 17:16:47 2005
@@ -54,6 +54,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Fri May 27 17:16:47 2005
@@ -24303,52 +24303,68 @@
case $na_list in
*-curl-*)
+ netaccessor=curl
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_CURL 1
_ACEOF
- netaccessor=curl
break
;;
*-cfurl-*)
+ netaccessor=cfurl
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_CFURL 1
_ACEOF
- netaccessor=cfurl
+
+ case $host_os in
+ darwin*)
+ test -z "${xerces_darwin_frameworks}" &&
xerces_darwin_frameworks="-"
+ case ${xerces_darwin_frameworks} in
+ *-CoreServices-*)
+ ;;
+ *)
+
xerces_darwin_frameworks="-CoreServices${xerces_darwin_frameworks}"
+ LIBS="-Wl,-framework -Wl,CoreServices $LIBS"
+ ;;
+ esac
+ ;;
+ esac
+
break
;;
*-winsock-*)
+ netaccessor=winsock
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_WINSOCK 1
_ACEOF
- netaccessor=winsock
break
;;
*-socket-*)
+ netaccessor=socket
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_SOCKET 1
_ACEOF
- netaccessor=socket
break
;;
*-libwww-*)
+ netaccessor=libwww
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_NETACCESSOR_LIBWWW 1
_ACEOF
- netaccessor=libwww
+ LIBS="${LIBS} -L${xerces_cv_libwww_prefix}/lib -lwww"
break
;;
@@ -24839,32 +24855,48 @@
case $tc_list in
*-icu-*)
+ transcoder=icu
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_TRANSCODER_ICU 1
_ACEOF
- transcoder=icu
+ LIBS="${LIBS} -L${xerces_cv_icu_prefix}/lib -licuuc
-licudata"
break
;;
*-macosunicodeconverter-*)
+ transcoder=macosunicodeconverter
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER 1
_ACEOF
- transcoder=macosunicodeconverter
+
+ case $host_os in
+ darwin*)
+ test -z "${xerces_darwin_frameworks}" &&
xerces_darwin_frameworks="-"
+ case ${xerces_darwin_frameworks} in
+ *-CoreServices-*)
+ ;;
+ *)
+
xerces_darwin_frameworks="-CoreServices${xerces_darwin_frameworks}"
+ LIBS="-Wl,-framework -Wl,CoreServices $LIBS"
+ ;;
+ esac
+ ;;
+ esac
+
break
;;
*-iconv-*)
+ transcoder=iconv
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_TRANSCODER_ICONV 1
_ACEOF
- transcoder=iconv
break
;;
@@ -25205,6 +25237,21 @@
cat >>confdefs.h <<\_ACEOF
#define XERCES_USE_ATOMICOPMGR_MACOS 1
_ACEOF
+
+
+ case $host_os in
+ darwin*)
+ test -z "${xerces_darwin_frameworks}" &&
xerces_darwin_frameworks="-"
+ case ${xerces_darwin_frameworks} in
+ *-CoreServices-*)
+ ;;
+ *)
+
xerces_darwin_frameworks="-CoreServices${xerces_darwin_frameworks}"
+ LIBS="-Wl,-framework -Wl,CoreServices $LIBS"
+ ;;
+ esac
+ ;;
+ esac
fi
Modified: xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Fri May 27 17:16:47
2005
@@ -73,6 +73,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_atomicopmgr_selection.m4
Fri May 27 17:16:47 2005
@@ -36,6 +36,7 @@
[
mgr=MacOS
AC_DEFINE([XERCES_USE_ATOMICOPMGR_MACOS], 1, [Define to use the MacOS AtomicOp
mgr])
+
XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
])
;;
esac
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_netaccessor_selection.m4
Fri May 27 17:16:47 2005
@@ -127,32 +127,34 @@
case $na_list in
*-curl-*)
- AC_DEFINE([XERCES_USE_NETACCESSOR_CURL], 1, [Define to
use the CURL NetAccessor])
netaccessor=curl
+ AC_DEFINE([XERCES_USE_NETACCESSOR_CURL], 1, [Define to
use the CURL NetAccessor])
break
;;
*-cfurl-*)
- AC_DEFINE([XERCES_USE_NETACCESSOR_CFURL], 1, [Define to
use the Mac OS X CFURL NetAccessor])
netaccessor=cfurl
+ AC_DEFINE([XERCES_USE_NETACCESSOR_CFURL], 1, [Define to
use the Mac OS X CFURL NetAccessor])
+ XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
break
;;
*-winsock-*)
- AC_DEFINE([XERCES_USE_NETACCESSOR_WINSOCK], 1, [Define
to use the WinSock NetAccessor])
netaccessor=winsock
+ AC_DEFINE([XERCES_USE_NETACCESSOR_WINSOCK], 1, [Define
to use the WinSock NetAccessor])
break
;;
*-socket-*)
- AC_DEFINE([XERCES_USE_NETACCESSOR_SOCKET], 1, [Define
to use the Sockets-based NetAccessor])
netaccessor=socket
+ AC_DEFINE([XERCES_USE_NETACCESSOR_SOCKET], 1, [Define
to use the Sockets-based NetAccessor])
break
;;
*-libwww-*)
- AC_DEFINE([XERCES_USE_NETACCESSOR_LIBWWW], 1, [Define
to use the libwww NetAccessor])
netaccessor=libwww
+ AC_DEFINE([XERCES_USE_NETACCESSOR_LIBWWW], 1, [Define
to use the libwww NetAccessor])
+ LIBS="${LIBS} -L${xerces_cv_libwww_prefix}/lib -lwww"
break
;;
Modified:
xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4
(original)
+++ xerces/c/branches/jberry/3.0-unstable/m4/xerces_transcoder_selection.m4 Fri
May 27 17:16:47 2005
@@ -99,20 +99,22 @@
case $tc_list in
*-icu-*)
- AC_DEFINE([XERCES_USE_TRANSCODER_ICU], 1, [Define to
use the ICU-based transcoder])
transcoder=icu
+ AC_DEFINE([XERCES_USE_TRANSCODER_ICU], 1, [Define to
use the ICU-based transcoder])
+ LIBS="${LIBS} -L${xerces_cv_icu_prefix}/lib -licuuc
-licudata"
break
;;
*-macosunicodeconverter-*)
-
AC_DEFINE([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], 1, [Define to use the
Mac OS UnicodeConverter-based transcoder])
transcoder=macosunicodeconverter
+
AC_DEFINE([XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER], 1, [Define to use the
Mac OS UnicodeConverter-based transcoder])
+ XERCES_LINK_DARWIN_FRAMEWORK([CoreServices])
break
;;
*-iconv-*)
- AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to
use the iconv transcoder])
transcoder=iconv
+ AC_DEFINE([XERCES_USE_TRANSCODER_ICONV], 1, [Define to
use the iconv transcoder])
break
;;
Modified: xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Fri May 27 17:16:47
2005
@@ -72,6 +72,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
Modified: xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in Fri May 27
17:16:47 2005
@@ -74,6 +74,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.am?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Fri May 27 17:16:47
2005
@@ -101,7 +101,6 @@
nobase_libwww_la_HEADERS = ${libwww_headers}
libwww_la_SOURCES = ${libwww_sources}
libwww_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${LIBWWW_PREFIX}/include/w3c-libwww
-libwww_la_LIBADD = -L${LIBWWW_PREFIX}/lib
-lwww
endif
if XERCES_USE_NETACCESSOR_CFURL
@@ -109,7 +108,6 @@
libcfurl_ladir = ${includedir}
nobase_libcfurl_la_HEADERS = ${cfurl_headers}
libcfurl_la_SOURCES = ${cfurl_sources}
-libcfurl_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
endif
#
@@ -121,7 +119,6 @@
nobase_libicu_la_HEADERS = ${icu_headers}
libicu_la_SOURCES = ${icu_sources}
libicu_la_CXXFLAGS = ${AM_CXXFLAGS}
-I${ICU_PREFIX}/include
-libicu_la_LIBADD = -L${ICU_PREFIX}/lib
-licuuc -licudata
endif
if XERCES_USE_TRANSCODER_ICONV
@@ -136,7 +133,6 @@
libmacosunicodeconverter_ladir = ${includedir}
nobase_libmacosunicodeconverter_la_HEADERS = ${macosunicodeconverter_headers}
libmacosunicodeconverter_la_SOURCES =
${macosunicodeconverter_sources}
-libmacosunicodeconverter_la_LDFLAGS = -Wl,-framework
-Wl,CoreServices
endif
#
@@ -171,7 +167,6 @@
libmacosaomgr_ladir = ${includedir}
nobase_libmacosaomgr_la_HEADERS = ${macosaomgr_headers}
libmacosaomgr_la_SOURCES = ${macosaomgr_sources}
-libmacosaomgr_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
endif
#
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Fri May 27 17:16:47
2005
@@ -129,6 +129,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
@@ -260,7 +261,7 @@
@XERCES_USE_TRANSCODER_ICONV_TRUE@ $(am__objects_5)
libiconv_la_OBJECTS = $(am_libiconv_la_OBJECTS)
@[EMAIL PROTECTED] =
-libicu_la_DEPENDENCIES =
+libicu_la_LIBADD =
am__libicu_la_SOURCES_DIST = \
xercesc/util/Transcoders/ICU/ICUTransService.cpp
am__objects_6 = \
@@ -561,7 +562,7 @@
xercesc/validators/schema/XUtil.lo
am_libvalidators_la_OBJECTS = $(am__objects_21)
libvalidators_la_OBJECTS = $(am_libvalidators_la_OBJECTS)
-libwww_la_DEPENDENCIES =
+libwww_la_LIBADD =
am__libwww_la_SOURCES_DIST = \
xercesc/util/NetAccessors/LibWWW/LibWWWNetAccessor.cpp \
xercesc/util/NetAccessors/LibWWW/BinURLInputStream.cpp
@@ -906,23 +907,19 @@
@[EMAIL PROTECTED] = ${libwww_headers}
@[EMAIL PROTECTED] = ${libwww_sources}
@[EMAIL PROTECTED] = ${AM_CXXFLAGS} -I${LIBWWW_PREFIX}/include/w3c-libwww
[EMAIL PROTECTED]@libwww_la_LIBADD = -L${LIBWWW_PREFIX}/lib -lwww
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${cfurl_headers}
@[EMAIL PROTECTED] = ${cfurl_sources}
[EMAIL PROTECTED]@libcfurl_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${icu_headers}
@[EMAIL PROTECTED] = ${icu_sources}
@[EMAIL PROTECTED] = ${AM_CXXFLAGS} -I${ICU_PREFIX}/include
[EMAIL PROTECTED]@libicu_la_LIBADD = -L${ICU_PREFIX}/lib -licuuc -licudata
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${iconv_headers}
@[EMAIL PROTECTED] = ${iconv_sources}
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${macosunicodeconverter_headers}
@[EMAIL PROTECTED] = ${macosunicodeconverter_sources}
[EMAIL PROTECTED]@libmacosunicodeconverter_la_LDFLAGS = -Wl,-framework
-Wl,CoreServices
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${inmemory_headers}
@[EMAIL PROTECTED] = ${inmemory_sources}
@@ -935,7 +932,6 @@
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${macosaomgr_headers}
@[EMAIL PROTECTED] = ${macosaomgr_sources}
[EMAIL PROTECTED]@libmacosaomgr_la_LDFLAGS = ${AM_LDFLAGS} -Wl,-framework
-Wl,CoreServices
@[EMAIL PROTECTED] = ${includedir}
@[EMAIL PROTECTED] = ${nothreadmmgr_headers}
@[EMAIL PROTECTED] = ${nothreadmmgr_sources}
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in?rev=178846&r1=178845&r2=178846&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Fri May 27 17:16:47
2005
@@ -72,6 +72,7 @@
$(top_srcdir)/m4/xerces_filemgr_selection.m4 \
$(top_srcdir)/m4/xerces_icu_prefix.m4 \
$(top_srcdir)/m4/xerces_libwww_prefix.m4 \
+ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \
$(top_srcdir)/m4/xerces_msgloader_selection.m4 \
$(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \
$(top_srcdir)/m4/xerces_netaccessor_selection.m4 \
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
