You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/02/13 14:10:51 UTC

cvs commit: xml-xerces/c/tests Makefile.incl configure.in runConfigure

tng         01/02/13 05:10:51

  Modified:    c/samples Makefile.incl configure.in runConfigure
               c/tests  Makefile.incl configure.in runConfigure
  Log:
  Update samples/tests files for on UnixWare 7.1.1 with gcc 2.95.  Add UNIXWARE platform defines to Makefile.incl, add recognition of sysv5uw7 to configure.in, and add unixware as recognized platform to runConfigure.  Updated by Hiram Clawson.
  
  Revision  Changes    Path
  1.27      +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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Makefile.incl	2000/12/22 16:32:48	1.26
  +++ Makefile.incl	2001/02/13 13:10:47	1.27
  @@ -54,7 +54,7 @@
   # <http://www.apache.org/>.
   #
   #
  -# $Id: Makefile.incl,v 1.26 2000/12/22 16:32:48 tng Exp $
  +# $Id: Makefile.incl,v 1.27 2001/02/13 13:10:47 tng 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
  +
  +#=============== UNIXWARE SPECIFIC OPTIONS =========================
  +ifeq (${PLATFORM}, UNIXWARE)
  +  CMP= -O2 -c ${CXXFLAGS} -pthread
  +  CC= g++ -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
  +  LINK = g++ -D${PLATFORM} -fpic -pthread
  +  EXTRA_LINK_OPTIONS=-lc -lsocket
  +  PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
     SHLIBSUFFIX=.so
   endif
   
  
  
  
  1.10      +2 -1      xml-xerces/c/samples/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in	2000/08/08 17:17:38	1.9
  +++ configure.in	2001/02/13 13:10:48	1.10
  @@ -33,7 +33,8 @@
           *-*-solaris*)   platform=SOLARIS ;;
           *-*-sysv5*)     platform=UNIXWARE ;;
           *-*-UnixWare*)  platform=UNIXWARE ;;
  -        *-*-unixware*)  platform=UNIXWARE ;;
  +        *-*-*unixware*)  platform=UNIXWARE ;;
  +        *-*-sysv5uw7*)  platform=UNIXWARE ;;
           *-*-linux*)     platform=LINUX ;;
           *-*-irix*)      platform=IRIX ;;
           *-*-aix*)       platform=AIX ;;
  
  
  
  1.15      +3 -3      xml-xerces/c/samples/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- runConfigure	2000/11/09 01:37:06	1.14
  +++ runConfigure	2001/02/13 13:10:48	1.15
  @@ -58,7 +58,7 @@
   #
   
   #
  -# $Id: runConfigure,v 1.14 2000/11/09 01:37:06 andyh Exp $
  +# $Id: runConfigure,v 1.15 2001/02/13 13:10:48 tng Exp $
   #
   
   #
  @@ -70,7 +70,7 @@
       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', 'linux', 'solaris',
  +    echo "       -p <platform> (accepts 'aix', 'unixware', 'linux', 'solaris',
   'hp-10', 'hp-11', 'os400', 'irix', 'ptx', 'tru64')"
       echo "       -c <C compiler name> (e.g. gcc, xlc or icc)"
       echo "       -x <C++ compiler name> (e.g. g++, xlC, or icc)"
  @@ -167,7 +167,7 @@
   
   # Now check if the options are correct or not, bail out if incorrect
   case $platform in
  -   aix | linux | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64)
  +   aix | unixware | linux | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64)
          # platform has been recognized
          ;;
      *)
  
  
  
  1.12      +11 -1     xml-xerces/c/tests/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.incl	2000/12/22 16:32:49	1.11
  +++ Makefile.incl	2001/02/13 13:10:50	1.12
  @@ -55,7 +55,7 @@
   #
   
   #
  -# $Id: Makefile.incl,v 1.11 2000/12/22 16:32:49 tng Exp $
  +# $Id: Makefile.incl,v 1.12 2001/02/13 13:10:50 tng Exp $
   #
   
   ################## LIBRARY NAMES AND DIRECTORIES ##################
  @@ -96,6 +96,16 @@
   PLATFORM_LIB_LINK_OPTIONS=-L/usr/lpp/xlC/lib
   EXTRA_LINK_OPTIONS=-lC
   SHLIBSUFFIX=.a
  +endif
  +
  +#=============== UNIXWARE SPECIFIC OPTIONS =========================
  +ifeq (${PLATFORM}, UNIXWARE)
  +CMP= -O2 -c ${CXXFLAGS} -pthread
  +CC= g++ -O2 -c -D${PLATFORM} -D_REENTRANT -fpic
  +LINK =  g++ -O2 -D${PLATFORM} -fpic  -pthread
  +PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
  +EXTRA_LINK_OPTIONS=-lc -lsocket
  +SHLIBSUFFIX=.so
   endif
   
   #================= PTX SPECIFIC OPTIONS ===========================
  
  
  
  1.10      +3 -1      xml-xerces/c/tests/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in	2000/07/28 01:33:39	1.9
  +++ configure.in	2001/02/13 13:10:50	1.10
  @@ -1,4 +1,4 @@
  -# $Id: configure.in,v 1.9 2000/07/28 01:33:39 aruna1 Exp $
  +# $Id: configure.in,v 1.10 2001/02/13 13:10:50 tng Exp $
   #
   #
   
  @@ -36,6 +36,8 @@
   case "${host}" in
           *-*-solaris*)   platform=SOLARIS ;;
           *-*-linux*)     platform=LINUX ;;
  +        *-*-*unixware*)     platform=UNIXWARE ;;
  +        *-*-sysv5uw7*)     platform=UNIXWARE ;;
           *-*-aix*)       platform=AIX ;;
           *-sequent-*)    platform=PTX ;;
           *-*-hp*)        platform=HPUX ;
  
  
  
  1.8       +8 -2      xml-xerces/c/tests/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/tests/runConfigure,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- runConfigure	2000/05/10 01:13:52	1.7
  +++ runConfigure	2001/02/13 13:10:50	1.8
  @@ -58,6 +58,9 @@
   #
   #
   # $Log: runConfigure,v $
  +# Revision 1.8  2001/02/13 13:10:50  tng
  +# Update samples/tests files for on UnixWare 7.1.1 with gcc 2.95.  Add UNIXWARE platform defines to Makefile.incl, add recognition of sysv5uw7 to configure.in, and add unixware as recognized platform to runConfigure.  Updated by Hiram Clawson.
  +#
   # Revision 1.7  2000/05/10 01:13:52  abagchi
   # Now detects AIX version and introduces -lpthreads_compat accordingly
   #
  @@ -93,7 +96,7 @@
       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', 'linux', 'solaris', 'hp-10', 'hp-11', 'ptx')"
  +    echo "       -p <platform> (accepts 'aix', 'unixware', 'linux', 'solaris', 'hp-10', 'hp-11', 'ptx')"
       echo "       -c <C compiler name> (e.g. gcc or xlc_r)"
       echo "       -x <C++ compiler name> (e.g. g++ or xlC_r)"
       echo "       -d (specifies that you want to build debug version)"
  @@ -180,7 +183,7 @@
   
   # Now check if the options are correct or not, bail out if incorrect
   case $platform in
  -   aix | linux | solaris | hp-10 | hp-11 | ptx)
  +   aix | unixware | linux | solaris | hp-10 | hp-11 | ptx)
          # platform has been recognized
          ;;
      *)
  @@ -257,6 +260,9 @@
   elif test $platform = "hp-10"; then
       threadingLibs="-lcma"
       threadingDefines="-DXML_USE_DCE"
  +elif test $platform = "unixware"; then
  +    threadingLibs="-pthread"
  +    threadingDefines="-pthread"
   fi
   
   #