dbertoni 01/11/27 06:29:43
Modified: c/src runConfigure
Log:
Reverted previous changes.
Revision Changes Path
1.7 +9 -10 xml-xalan/c/src/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/runConfigure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- runConfigure 2001/11/27 01:19:25 1.6
+++ runConfigure 2001/11/27 14:29:43 1.7
@@ -58,8 +58,8 @@
#
#
# $Log: runConfigure,v $
-# Revision 1.6 2001/11/27 01:19:25 dbertoni
-# Added support for extra configuration options and removed support for
unused ones. Fixes bug 4631.
+# Revision 1.7 2001/11/27 14:29:43 dbertoni
+# Reverted previous changes.
#
# Revision 1.5 2001/08/14 16:10:18 dbertoni
# Changes from James Berry <[EMAIL PROTECTED]> for Mac OS X support.
@@ -105,9 +105,9 @@
echo " -c <C compiler name> (e.g. gcc, cc, xlc)"
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 " -l <extra linker options>"
echo " -z <extra compiler options>"
- echo " -C <any one extra configure options>"
echo " -h (to get help on the above commands)"
}
@@ -134,7 +134,7 @@
fi
# Get the command line parameters
-set -- `getopt p:c:x:dm:n:t:l:z:h $*`
+set -- `getopt p:c:x:dm:n:t:r:l:z:h $*`
if [ $? != 0 ]
then
usage
@@ -160,15 +160,15 @@
-d)
debug=on; shift;;
+ -r)
+ thread=$2; shift 2;;
+
-l)
linkeroption=$2; shift 2;;
-z)
compileroption=$2; shift 2;;
- -C)
- configureoptions="$configureoptions $2"; shift 2;;
-
-h)
usage
exit ${ERROR_EXIT_CODE};;
@@ -185,7 +185,6 @@
echo "Extra compile options: $compileroption"
echo "Extra link options: $linkeroption"
echo "Thread option: $thread"
-echo "Extra configure options: $configureoptions"
#
@@ -270,13 +269,13 @@
# Set the extra C and C++ compiler flags
#
-CXXFLAGS="$compileroption $debugflag $threadingDefines"
+CXXFLAGS="$compileroption $debugflag $transcodingDefines $threadingDefines"
export CXXFLAGS
-CFLAGS="$compileroption $debugflag $threadingDefines"
+CFLAGS="$compileroption $debugflag $transcodingDefines $threadingDefines"
export CFLAGS
-LIBS="$$threadingLibs "
+LIBS="$transcodingLibs $threadingLibs "
export LIBS
@@ -284,7 +283,7 @@
rm -f config.cache
rm -f config.log
rm -f config.status
-sh ./configure $configureoptions
+./configure
echo
echo If the result of the above commands look OK to you, go to the directory
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
