peiyongz 2002/10/28 10:17:58
Modified: c/src/xercesc runConfigure Makefile.incl
Log:
build with -micu on unix
Revision Changes Path
1.19 +4 -3 xml-xerces/c/src/xercesc/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/runConfigure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- runConfigure 4 Sep 2002 17:15:44 -0000 1.18
+++ runConfigure 28 Oct 2002 18:17:57 -0000 1.19
@@ -478,7 +478,8 @@
exit ${ERROR_EXIT_CODE};
fi
MESSAGELOADER=ICU;
- msgloaderDefines="-DXML_USE_ICU_MESSAGELOADER" ;;
+ msgloaderLibs="-L${ICUROOT} -L${ICUROOT}/lib -L${ICUROOT}/data";
+ msgloaderDefines="-DXML_USE_ICU_MESSAGELOADER -I${ICUROOT}/include";;
inmem)
;;
@@ -607,7 +608,7 @@
LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink"
export LDFLAGS
-LIBS="$transcodingLibs $threadingLibs $netaccessorLibs"
+LIBS="$transcodingLibs $msgloaderLibs $threadingLibs $netaccessorLibs"
export LIBS
1.26 +32 -1 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.incl 5 Sep 2002 15:05:43 -0000 1.25
+++ Makefile.incl 28 Oct 2002 18:17:57 -0000 1.26
@@ -123,6 +123,12 @@
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
-lm -lgen
endif
+
+ ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
+ -licuuc -licudata -lm -lgen
+ endif
+
else
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XML_OBJ_DIR) \
-features=rtti -D${PLATFORM} -D_REENTRANT
@@ -133,6 +139,11 @@
else
ALLLIBS = -mt ${LIBS}
endif
+
+ ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = -mt -licuuc -licudata ${LIBS}
+ endif
+
endif
SHLIBSUFFIX=.so
## Compiler switch to embed a library name
@@ -228,6 +239,11 @@
else
ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib
endif
+
+ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc -licudata
+endif
+
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE
ifeq (${BITSTOBUILD}, 64)
@@ -293,6 +309,11 @@
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
endif
+
+ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
+endif
+
EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
SHLIBSUFFIX=.so
## Compiler switch to embed a library name
@@ -365,6 +386,11 @@
else
ALLLIBS = ${LIBS}
endif
+
+ ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = $(LIBS} -licuuc -licudata
+ endif
+
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,.
SHLIBSUFFIX=.sl
else
@@ -383,6 +409,11 @@
else
ALLLIBS = ${LIBS}
endif
+
+ ifeq (${MESSAGELOADER}, ICU)
+ ALLLIBS = $(LIBS} -licuuc -licudata
+ endif
+
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,+b,. -Wl,-a,shared
SHLIBSUFFIX=.sl
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
