You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2002/02/27 23:38:23 UTC
cvs commit: xml-xerces/c/src/xercesc runConfigure Makefile.incl configure.in configure
peiyongz 02/02/27 14:38:23
Modified: c/src/xercesc runConfigure Makefile.incl configure.in
configure
Log:
Bug# 6445 Caldera (SCO) OpenServer Port : patch from Martin Kalen
Revision Changes Path
1.3 +29 -10 xml-xerces/c/src/xercesc/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/runConfigure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- runConfigure 18 Feb 2002 05:51:49 -0000 1.2
+++ runConfigure 27 Feb 2002 22:38:23 -0000 1.3
@@ -55,7 +55,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: runConfigure,v 1.2 2002/02/18 05:51:49 jberry Exp $
+# $Id: runConfigure,v 1.3 2002/02/27 22:38:23 peiyongz Exp $
#
#
@@ -79,14 +79,20 @@
echo "Usage: runConfigure \"options\""
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris',
- 'hp-10', 'hp-11', 'unixware', 'os400', 'irix', 'ptx', 'tru64', 'macosx' )"
+ 'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
+ 'ptx', 'tru64', 'macosx')"
echo " -c <C compiler name> (e.g. gcc, cc, xlc_r, icc)"
echo " -x <C++ compiler name> (e.g. g++, CC, xlC_r, icc, c++)"
echo " -d (specifies that you want to build debug version)"
- echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or 'iconv'"
- echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket' or 'native'"
- echo " -t <transcoder> can be 'icu', 'Iconv400', 'Iconv390', 'IconvFBSD' or 'native'"
- echo " -r <thread option> can be 'pthread' or 'dce' (only used on aix, HP-11 and solaris) or 'sproc' (only on IRIX) or 'none'"
+ echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or
+ 'iconv'"
+ echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket' or
+ 'native'"
+ echo " -t <transcoder> can be 'icu', 'Iconv400', 'Iconv390',
+ 'IconvFBSD' or 'native'"
+ echo " -r <thread option> can be 'pthread',
+ 'dce' (only on aix, HP-11 and solaris),
+ 'sproc' (only on IRIX) or 'none'"
echo " -l <extra linker options>"
echo " -z <extra compiler options>"
echo " -P <install-prefix>"
@@ -214,7 +220,7 @@
#
case $platform in
- aix | linux | freebsd | solaris | hp-10 | hp-11 | irix | unixware | os400 | ptx | tru64 | macosx)
+ aix | linux | freebsd | solaris | hp-10 | hp-11 | irix | openserver | unixware | os400 | ptx | tru64 | macosx)
# platform has been recognized
;;
*)
@@ -274,9 +280,22 @@
exit ${ERROR_EXIT_CODE};;
esac
fi
+ elif test $platform = "openserver"; then
+ case $thread in
+ pthread)
+ if test $cppcompiler = "g++"; then
+ threadingLibs="-Wl,-B,static,-l,pthread,-B,dynamic"
+ fi
+ ;;
+ *)
+ echo "I do not recognize the thread option '$thread'."
+ echo "Please type '${0} -h' for help."
+ exit ${ERROR_EXIT_CODE}
+ ;;
+ esac
elif test $platform = "freebsd"; then
- threadingLibs="-pthread -lc_r"
- threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+ threadingLibs="-pthread -lc_r"
+ threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
elif test $platform = "aix"; then
aix_version=`./config.guess`;
echo Found host system to be $aix_version
@@ -445,7 +464,7 @@
NETACCESSOR=Socket
netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET"
case $platform in
- unixware)
+ unixware|openserver)
netaccessorLibs="-lnsl -lsocket";;
hp-11)
netaccessorLibs="-lnsl";;
1.4 +26 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.incl 20 Feb 2002 20:01:38 -0000 1.3
+++ Makefile.incl 27 Feb 2002 22:38:23 -0000 1.4
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.3 2002/02/20 20:01:38 tng Exp $
+# $Id: Makefile.incl,v 1.4 2002/02/27 22:38:23 peiyongz Exp $
#
###################################################################
@@ -158,6 +158,31 @@
ALLLIBS = ${LIBS} -L/usr/local/lib -L/usr/ccs/lib \
-lm -lw -lC -lc -lgen
endif
+ endif
+ SHLIBSUFFIX=.so
+endif
+
+#=============== OPENSERVER SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, OPENSERVER)
+ ifeq (${CXX}, g++)
+ COMMON_COMPILE_OPTIONS = -D${PLATFORM} -fPIC
+ ifeq (${THREADS}, none)
+ PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS}
+ else
+ PLATFORM_COMPILE_OPTIONS = ${COMMON_COMPILE_OPTIONS} -D_REENTRANT
+ endif
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
+ EXTRA_LINK_OPTIONS = -Wl,-h,${LIBNAME}${VER}${SHLIBSUFFIX}
+ else
+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -belf -KPIC
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -belf -G ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -belf -G ${LDFLAGS}
+ endif
+ ifeq (${TRANSCODER}, ICU)
+ ALLLIBS = ${LIBS} -licu-uc -licudata
+ else
+ ALLLIBS = ${LIBS}
endif
SHLIBSUFFIX=.so
endif
1.4 +7 -3 xml-xerces/c/src/xercesc/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 20 Feb 2002 21:44:28 -0000 1.3
+++ configure.in 27 Feb 2002 22:38:23 -0000 1.4
@@ -28,6 +28,7 @@
dnl Platform-specific Makefile setup
case "${host}" in
*-*-solaris*) platform=SOLARIS ;;
+ *-*-sco*) platform=OPENSERVER ;;
*-*-sysv5*) platform=UNIXWARE ;;
*-*-UnixWare*) platform=UNIXWARE ;;
*-*-unixware*) platform=UNIXWARE ;;
@@ -118,6 +119,7 @@
util/Platforms/OS400/Makefile \
util/Platforms/IRIX/Makefile \
util/Platforms/PTX/Makefile \
+util/Platforms/OpenServer/Makefile \
util/Platforms/UnixWare/Makefile \
util/Platforms/Tru64/Makefile \
util/Platforms/MacOS/Makefile \
@@ -148,6 +150,8 @@
[chmod +x ./runConfigure],)
echo
-echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html
-echo Still cannot resolve it? Find out if someone else had the same problem before.
-echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev
+echo Having build problems?
+echo Read instructions at http://xml.apache.org/xerces-c/build.html
+echo Still cannot resolve it?
+echo Find out if someone else had the same problem before.
+echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev
1.3 +8 -3 xml-xerces/c/src/xercesc/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 18 Feb 2002 06:36:44 -0000 1.2
+++ configure 27 Feb 2002 22:38:23 -0000 1.3
@@ -1250,6 +1250,7 @@
case "${host}" in
*-*-solaris*) platform=SOLARIS ;;
+ *-*-sco*) platform=OPENSERVER ;;
*-*-sysv5*) platform=UNIXWARE ;;
*-*-UnixWare*) platform=UNIXWARE ;;
*-*-unixware*) platform=UNIXWARE ;;
@@ -1452,6 +1453,7 @@
util/Platforms/OS400/Makefile \
util/Platforms/IRIX/Makefile \
util/Platforms/PTX/Makefile \
+util/Platforms/OpenServer/Makefile \
util/Platforms/UnixWare/Makefile \
util/Platforms/Tru64/Makefile \
util/Platforms/MacOS/Makefile \
@@ -1595,6 +1597,7 @@
util/Platforms/OS400/Makefile \
util/Platforms/IRIX/Makefile \
util/Platforms/PTX/Makefile \
+util/Platforms/OpenServer/Makefile \
util/Platforms/UnixWare/Makefile \
util/Platforms/Tru64/Makefile \
util/Platforms/MacOS/Makefile \
@@ -1693,6 +1696,8 @@
echo
-echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html
-echo Still cannot resolve it? Find out if someone else had the same problem before.
-echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev
+echo Having build problems?
+echo Read instructions at http://xml.apache.org/xerces-c/build.html
+echo Still cannot resolve it?
+echo Find out if someone else had the same problem before.
+echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org