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:37:56 UTC
cvs commit: xml-xerces/c/samples runConfigure Makefile.incl configure.in configure
peiyongz 02/02/27 14:37:56
Modified: c/samples runConfigure Makefile.incl configure.in configure
Log:
Bug# 6445 Caldera (SCO) OpenServer Port : patch from Martin Kalen
Revision Changes Path
1.26 +5 -8 xml-xerces/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- runConfigure 18 Jan 2002 19:40:55 -0000 1.25
+++ runConfigure 27 Feb 2002 22:37:55 -0000 1.26
@@ -56,7 +56,7 @@
#
#
-# $Id: runConfigure,v 1.25 2002/01/18 19:40:55 tng Exp $
+# $Id: runConfigure,v 1.26 2002/02/27 22:37:55 peiyongz Exp $
#
#
@@ -68,8 +68,9 @@
echo "runConfigure: Helper script to run \"configure\" for one of the supported platforms"
echo "Usage: runConfigure \"options\""
echo " where options may be any of the following:"
- echo " -p <platform> (accepts 'aix', 'unixware', 'linux', 'freebsd', 'solaris',
-'hp-10', 'hp-11', 'os400', 'irix', 'ptx', 'tru64', 'macosx')"
+ echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'solaris',
+ 'hp-10', 'hp-11', 'openserver', 'unixware', 'os400', 'irix',
+ 'ptx', 'tru64', 'macosx')"
echo " -c <C compiler name> (e.g. gcc, xlc or icc)"
echo " -x <C++ compiler name> (e.g. g++, xlC, or icc)"
echo " -d (specifies that you want to build debug version)"
@@ -121,9 +122,6 @@
# Set up the default values for each parameter
debug=off # by default debug is off
-transcoder=native # by default use native transcoder
-msgloader=iconv # by default use native transcoder
-netaccessor=fileonly # by default use fileonly
compileroptions=""
while [ $# -gt 0 ]
do
@@ -178,7 +176,7 @@
# Now check if the options are correct or not, bail out if incorrect
#
case $platform in
- aix | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx)
+ aix | openserver | unixware | linux | freebsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx)
# platform has been recognized
;;
*)
@@ -273,4 +271,3 @@
echo ${XERCESCROOT}/samples and type \"gmake\" to make the samples.
exit 0;
-
1.38 +11 -1 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.incl 18 Jan 2002 19:40:55 -0000 1.37
+++ Makefile.incl 27 Feb 2002 22:37:55 -0000 1.38
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.37 2002/01/18 19:40:55 tng Exp $
+# $Id: Makefile.incl,v 1.38 2002/02/27 22:37:55 peiyongz Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -110,6 +110,16 @@
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
EXTRA_LINK_OPTIONS=-lc -lgen
endif
+ SHLIBSUFFIX=.so
+endif
+
+#=============== OPENSERVER SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, OPENSERVER)
+ CC=${COMPILER} -D${PLATFORM} -fPIC
+ CMP=-c ${CXXFLAGS}
+ LINK=${CC} ${LDFLAGS}
+ EXTRA_LINK_OPTIONS=-lc -lsocket
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.so
endif
1.16 +6 -8 xml-xerces/c/samples/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.in 29 Nov 2001 18:25:18 -0000 1.15
+++ configure.in 27 Feb 2002 22:37:55 -0000 1.16
@@ -7,9 +7,6 @@
AC_PROG_INSTALL
AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
-dnl Checks for libraries
-AC_CHECK_LIB(m, floor)
-
dnl special pthread handling (AIX uses pthreads instead of pthread)
AC_CHECK_LIB(pthread, pthread_create)
if test $ac_cv_lib_pthread_pthread_create = no; then
@@ -31,12 +28,13 @@
dnl Platform-specific Makefile setup
case "${host}" in
*-*-solaris*) platform=SOLARIS ;;
+ *-*-sco*) platform=OPENSERVER ;;
*-*-sysv5*) platform=UNIXWARE ;;
*-*-UnixWare*) platform=UNIXWARE ;;
- *-*-*unixware*) platform=UNIXWARE ;;
+ *-*-*unixware*) platform=UNIXWARE ;;
*-*-sysv5uw7*) platform=UNIXWARE ;;
*-*-linux*) platform=LINUX ;;
- *-*-freebsd*) platform=FREEBSD ;;
+ *-*-freebsd*) platform=FREEBSD ;;
*-*-irix*) platform=IRIX ;;
*-*-aix*) platform=AIX ;;
*-*-hp*) platform=HPUX ;
@@ -48,7 +46,7 @@
*-*-mvs*) platform=OS390 ;;
*-*-os400*) platform=OS400 ;;
*-*-OS400*) platform=OS400 ;;
- *-*-osf*) platform=TRU64 ;;
+ *-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*) platform=UNKNOWN ;;
esac
@@ -88,5 +86,5 @@
CreateDOMDocument/Makefile])
echo
-echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html
-
+echo Having build problems?
+echo Read instructions at http://xml.apache.org/xerces-c/build.html
1.18 +23 -70 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure 29 Nov 2001 18:25:18 -0000 1.17
+++ configure 27 Feb 2002 22:37:55 -0000 1.18
@@ -1001,56 +1001,8 @@
fi
-echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
-echo "configure:1006: checking for floor in -lm" >&5
-ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1014 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char floor();
-
-int main() {
-floor()
-; return 0; }
-EOF
-if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lm $LIBS"
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1054: checking for pthread_create in -lpthread" >&5
+echo "configure:1006: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1058,7 +1010,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1062 "configure"
+#line 1014 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1069,7 +1021,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1098,7 +1050,7 @@
if test $ac_cv_lib_pthread_pthread_create = no; then
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:1102: checking for pthread_create in -lpthreads" >&5
+echo "configure:1054: checking for pthread_create in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1106,7 +1058,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1110 "configure"
+#line 1062 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1117,7 +1069,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1147,7 +1099,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1151: checking how to run the C preprocessor" >&5
+echo "configure:1103: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1162,13 +1114,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1118 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1179,13 +1131,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1183 "configure"
+#line 1135 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1196,13 +1148,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1200 "configure"
+#line 1152 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1230,17 +1182,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1234: checking for $ac_hdr" >&5
+echo "configure:1186: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1239 "configure"
+#line 1191 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1280,7 +1232,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1284: checking host system type" >&5
+echo "configure:1236: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1303,12 +1255,13 @@
case "${host}" in
*-*-solaris*) platform=SOLARIS ;;
+ *-*-sco*) platform=OPENSERVER ;;
*-*-sysv5*) platform=UNIXWARE ;;
*-*-UnixWare*) platform=UNIXWARE ;;
- *-*-*unixware*) platform=UNIXWARE ;;
+ *-*-*unixware*) platform=UNIXWARE ;;
*-*-sysv5uw7*) platform=UNIXWARE ;;
*-*-linux*) platform=LINUX ;;
- *-*-freebsd*) platform=FREEBSD ;;
+ *-*-freebsd*) platform=FREEBSD ;;
*-*-irix*) platform=IRIX ;;
*-*-aix*) platform=AIX ;;
*-*-hp*) platform=HPUX ;
@@ -1320,7 +1273,7 @@
*-*-mvs*) platform=OS390 ;;
*-*-os400*) platform=OS400 ;;
*-*-OS400*) platform=OS400 ;;
- *-*-osf*) platform=TRU64 ;;
+ *-*-osf*) platform=TRU64 ;;
*-apple-*) platform=MACOSX ;;
*) platform=UNKNOWN ;;
esac
@@ -1648,5 +1601,5 @@
echo
-echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html
-
+echo Having build problems?
+echo Read instructions at http://xml.apache.org/xerces-c/build.html
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org