You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/08/05 22:33:54 UTC
cvs commit: xml-xalan/c/src configure configure.in Makefile.in runConfigure
dbertoni 2002/08/05 13:33:54
Modified: c/src configure configure.in Makefile.in runConfigure
Log:
Changes to implement 32 and 64-bit builds.
Revision Changes Path
1.6 +6 -4 xml-xalan/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure 14 Aug 2001 16:10:18 -0000 1.5
+++ configure 5 Aug 2002 20:33:54 -0000 1.6
@@ -1332,19 +1332,19 @@
cflags=${CFLAGS}
-ldflags=${LDCFLAGS}
+ldflags=${LDFLAGS}
libs=${LIBS}
-uselibwww=${USELIBWWW}
+transcoder=${TRANSCODER}
-messageloader=${MESSAGELOADER}
+threads=${THREADS}
-transcoder=${TRANSCODER}
+bitstobuild=${BITSTOBUILD}
trap '' 1 2 15
@@ -1516,6 +1516,8 @@
s%@uselibwww@%$uselibwww%g
s%@messageloader@%$messageloader%g
s%@transcoder@%$transcoder%g
+s%@bitstobuild@%$bitstobuild%g
+s%@threads@%$threads%g
CEOF
EOF
1.5 +10 -1 xml-xalan/c/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in 30 Aug 2001 18:46:43 -0000 1.4
+++ configure.in 5 Aug 2002 20:33:54 -0000 1.5
@@ -60,11 +60,20 @@
cflags=${CFLAGS}
AC_SUBST(cflags)
-ldflags=${LDCFLAGS}
+ldflags=${LDFLAGS}
AC_SUBST(ldflags)
libs=${LIBS}
AC_SUBST(libs)
+
+transcoder=${TRANSCODER}
+AC_SUBST(transcoder)
+
+threads=${THREADS}
+AC_SUBST(threads)
+
+bitstobuild=${BITSTOBUILD}
+AC_SUBST(bitstobuild)
dnl output the Makefiles
+AC_OUTPUT([Makefile])
1.100 +29 -12 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- Makefile.in 23 May 2002 00:13:24 -0000 1.99
+++ Makefile.in 5 Aug 2002 20:33:54 -0000 1.100
@@ -136,27 +136,42 @@
CXX = @cxx@
CXXFLAGS = @cxxflags@
PREFIX = @prefix@
+LDFLAGS = @ldflags@
#=============== LINUX SPECIFIC OPTIONS =========================
ifeq ($(PLATFORM), LINUX)
SUPPORTED = TRUE
- PLATFORM_COMPILE_OPTIONS = -fpic -Wall -D${PLATFORM} -D_REENTRANT
ALLLIBS = ${LIBS} -L/usr/lib
SHLIBSUFFIX=.so
+ PIC_OPTION=
+
+ ifeq (${CXX}, icpc)
+
+ PIC_OPTION=-KPIC
+ PLATFORM_COMPILE_OPTIONS = -w1 -Xa -mp -prec_div
+
+ else
+
+ PIC_OPTION=-fPIC
+ PLATFORM_COMPILE_OPTIONS = -Wall
+
+ endif
+
+ PLATFORM_COMPILE_OPTIONS += ${PIC_OPTION} -D${PLATFORM} -D_REENTRANT
# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
- LD_RPATH_PRE= -Wl,-rpath,
- PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
+ LD_RPATH_PRE= -Wl,-rpath,
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib
endif
- EXTRA_LINK_OPTIONS=-lc
+ EXTRA_LINK_OPTIONS=
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fpic
- LINK = g++ -D${PLATFORM} -fpic
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION}
+ LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
endif
@@ -165,14 +180,14 @@
ifeq ($(PLATFORM), HPUX)
SUPPORTED = TRUE
- PLATFORM_COMPILE_OPTIONS = +Z -D${PLATFORM} -D_THREAD_SAFE +DAportable
+ PLATFORM_COMPILE_OPTIONS = +Z -D${PLATFORM} -D_THREAD_SAFE
PLATFORM_CXX_COMPILE_OPTIONS = +p -mt -Aa
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = $(CXX) -b +Z -Wl,+s
- LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
+ MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
+ LINK = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
endif
@@ -253,8 +268,10 @@
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
endif
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl
- LINK = $(CXX) -qnotempinc $(CXXFLAGS) -brtl $(PLATFORM_COMPILE_OPTIONS)
+
+ MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl ${bitstobuildLink}
+
+ LINK = $(CXX) -qnotempinc $(CXXFLAGS) -brtl $(PLATFORM_COMPILE_OPTIONS) ${bitstobuildLink}
endif
@@ -325,7 +342,7 @@
ifeq ($(PLATFORM), OS390)
ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_7_0.x
else
- ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_7_0
+ ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c
endif
# We need the ICU library if we are using the ICUBridge
1.10 +87 -15 xml-xalan/c/src/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/runConfigure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- runConfigure 1 Aug 2002 18:36:38 -0000 1.9
+++ runConfigure 5 Aug 2002 20:33:54 -0000 1.10
@@ -58,6 +58,9 @@
#
#
# $Log$
+# Revision 1.10 2002/08/05 20:33:54 dbertoni
+# Changes to implement 32 and 64-bit builds.
+#
# Revision 1.9 2002/08/01 18:36:38 dbertoni
# Added support for Intel compiler.
#
@@ -112,6 +115,7 @@
echo " -x <C++ compiler name> (e.g. g++, CC, xlC)"
echo " -d (specifies that you want to build debug version)"
echo " -r <thread option> can be 'pthread' or 'dce' (only used on HP-11)"
+ echo " -b <bitsToBuild> (accepts '64', '32')"
echo " -l <extra linker options>"
echo " -z <extra compiler options>"
echo " -C <any one extra configure options>"
@@ -141,7 +145,7 @@
fi
# Get the command line parameters
-set -- `getopt p:c:x:dm:n:t:r:l:z:h $*`
+set -- `getopt p:c:x:dm:n:t:r:l:z:h:b $*`
if [ $? != 0 ]
then
usage
@@ -150,41 +154,49 @@
# Set up the default values for each parameter
debug=off # by default debug is off
-msgloader=inmem # by default use native transcoder
+bitsToBuild=32 # by default 32 bit build assumed
for i in $*
do
case $i in
-p)
platform=$2; shift 2;;
-
+
-c)
ccompiler=$2; shift 2;;
-
+
-x)
cppcompiler=$2; shift 2;;
-
+
-d)
debug=on; shift;;
-
+
-r)
thread=$2; shift 2;;
-
- -l)
- linkeroption=$2; shift 2;;
-
+
+ -b)
+ bitsToBuild=$2; shift 2;;
+
+ -l)
+ linkeroptions="$linkeroptions $2"; shift 2;;
+
-z)
compileroptions="$compileroptions $2"; shift 2;;
-
+
-C)
configureoptions="$configureoptions $2"; shift 2;;
-h)
usage
exit ${ERROR_EXIT_CODE};;
-
+
--)
shift; break;;
+
+ *)
+ echo "unknown option $1"
+ usage
+ exit ${ERROR_EXIT_CODE};;
esac
done
@@ -193,8 +205,9 @@
echo "C Compiler: $ccompiler"
echo "C++ Compiler: $cppcompiler"
echo "Extra compile options: $compileroptions"
-echo "Extra link options: $linkeroption"
+echo "Extra link options: $linkeroptions"
echo "Thread option: $thread"
+echo "bitsToBuild option: $bitsToBuild"
echo "Extra configure options: $configureoptions"
@@ -227,6 +240,62 @@
#
+# Check for the bitsToBuild option
+#
+
+#
+# aix | linux | hp-11 | solaris |
+# hp-10 | freebsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx
+#
+if test $bitsToBuild = 64; then
+ bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
+ bitstobuildLink=" "
+ if test $platform; then
+ case $platform in
+ solaris)
+ bitstobuildDefines=" $bitstobuildDefines -xarch=v9 "
+ bitstobuildLink=" -xarch=v9 " ;;
+ aix)
+ bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 " ;;
+ bitstobuildLink=" -X64 " ;;
+ hp-11)
+ bitstobuildDefines=" $bitstobuildDefines +DA2.0W "
+ bitstobuildLink=" +DA2.0W " ;;
+ linux)
+ bitstobuildDefines=" $bitstobuildDefines " ;;
+ *)
+ ;;
+ esac
+ fi
+elif test $bitsToBuild = 32; then
+ bitstobuildDefines=" "
+ bitstobuildLink=" "
+ if test $platform; then
+ case $platform in
+ solaris)
+ ;;
+ aix)
+ ;;
+ hp-11)
+ bitstobuildDefines=" $bitstobuildDefines +DAportable "
+ linux)
+ ;;
+ *)
+ ;;
+ esac
+ fi
+else
+ echo "I do not recognize the bitsToBuild '$bitsToBuild'. Please type '${0} -h' for help."
+ exit ${ERROR_EXIT_CODE};
+fi
+
+#
+# to export in case it is needed in Makefile.in/Makefine.incl
+#
+BITSTOBUILD=$bitsToBuild
+export BITSTOBUILD
+
+#
# Check for the threading option only for hp-11
#
@@ -280,11 +349,14 @@
# Set the extra C and C++ compiler flags
#
-CXXFLAGS="$compileroptions $debugflag $transcodingDefines $threadingDefines"
+CXXFLAGS="$compileroptions $debugflag $transcodingDefines $threadingDefines $bitstobuildDefines "
export CXXFLAGS
-CFLAGS="$compileroptions $debugflag $transcodingDefines $threadingDefines"
+CFLAGS="$compileroptions $debugflag $transcodingDefines $threadingDefines $bitstobuildDefines "
export CFLAGS
+
+LDFLAGS="$LDFLAGS $linkeroptions $bitstobuildLink"
+export LDFLAGS
LIBS="$transcodingLibs $threadingLibs "
export LIBS
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org