You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ar...@locus.apache.org on 2000/08/01 20:26:39 UTC

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

aruna1      00/08/01 11:26:37

  Modified:    c/src    configure configure.in Makefile.incl runConfigure
  Log:
  Tru64 support added
  
  Revision  Changes    Path
  1.18      +6 -122    xml-xerces/c/src/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/configure,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- configure	2000/04/04 20:09:56	1.17
  +++ configure	2000/08/01 18:26:29	1.18
  @@ -1,7 +1,7 @@
   #! /bin/sh
   
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated automatically using autoconf version 2.13
  +# Generated automatically using autoconf version 2.13 
   # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
   #
   # This configure script is free software; the Free Software Foundation
  @@ -1304,7 +1304,6 @@
           *-*-linux*)     platform=LINUX ;;
           *-*-irix*)      platform=IRIX ;;
           *-*-aix*)       platform=AIX ;;
  -        *-sequent-*)    platform=PTX ;;
           *-*-hp*)        platform=HPUX ;
                           case "${host}" in
                               *-*-hpux11*)  osver=HPUX11;;
  @@ -1314,6 +1313,7 @@
           *-*-mvs*)       platform=OS390 ;;
           *-*-os400*)     platform=OS400 ;;
           *-*-OS400*)     platform=OS400 ;;
  +        *-*-osf*)	platform=TRU64 ;;
           *)              platform=UNKNOWN ;;
   esac
   
  @@ -1417,8 +1417,8 @@
   
   trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
   
  -DEFS=-DHAVE_CONFIG_H
  -
  +# Transform confdefs.h into DEFS.
  +# Protect against shell expansion while executing Makefile rules.
   # Protect against Makefile macro expansion.
   cat > conftest.defs <<\EOF
   s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
  @@ -1427,16 +1427,7 @@
   s%\]%\\&%g
   s%\$%$$%g
   EOF
  -if test "$platform" = "OS390"; then
  -# OS390 - EBCDIC NL is '\025'
  -DEFS=`sed -f conftest.defs confdefs.h | tr '\025' ' '`
  -else
  -if test "$platform" = "OS400"; then
  -DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
  -else
   DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
  -fi
  -fi
   rm -f conftest.defs
   
   
  @@ -1491,7 +1482,7 @@
   util/Platforms/OS400/Makefile \
   util/Platforms/IRIX/Makefile \
   util/Platforms/UnixWare/Makefile \
  -util/Platforms/PTX/Makefile \
  +util/Platforms/Tru64/Makefile \
   util/Compilers/Makefile \
   util/MsgLoaders/InMemory/Makefile \
   util/MsgLoaders/ICU/Makefile \
  @@ -1617,7 +1608,7 @@
   util/Platforms/OS400/Makefile \
   util/Platforms/IRIX/Makefile \
   util/Platforms/UnixWare/Makefile \
  -util/Platforms/PTX/Makefile \
  +util/Platforms/Tru64/Makefile \
   util/Compilers/Makefile \
   util/MsgLoaders/InMemory/Makefile \
   util/MsgLoaders/ICU/Makefile \
  @@ -1688,113 +1679,6 @@
   " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
   fi; done
   rm -f conftest.s*
  -
  -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
  -# NAME is the cpp macro being defined and VALUE is the value it is being given.
  -#
  -# ac_d sets the value in "#define NAME VALUE" lines.
  -ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
  -ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
  -ac_dC='\3'
  -ac_dD='%g'
  -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
  -ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
  -ac_uB='\([ 	]\)%\1#\2define\3'
  -ac_uC=' '
  -ac_uD='\4%g'
  -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
  -ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
  -ac_eB='$%\1#\2define\3'
  -ac_eC=' '
  -ac_eD='%g'
  -
  -if test "${CONFIG_HEADERS+set}" != set; then
  -EOF
  -cat >> $CONFIG_STATUS <<EOF
  -  CONFIG_HEADERS="conf.h"
  -EOF
  -cat >> $CONFIG_STATUS <<\EOF
  -fi
  -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
  -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
  -  case "$ac_file" in
  -  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
  -       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
  -  *) ac_file_in="${ac_file}.in" ;;
  -  esac
  -
  -  echo creating $ac_file
  -
  -  rm -f conftest.frag conftest.in conftest.out
  -  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
  -  cat $ac_file_inputs > conftest.in
  -
  -EOF
  -
  -# Transform confdefs.h into a sed script conftest.vals that substitutes
  -# the proper values into config.h.in to produce config.h.  And first:
  -# Protect against being on the right side of a sed subst in config.status.
  -# Protect against being in an unquoted here document in config.status.
  -rm -f conftest.vals
  -cat > conftest.hdr <<\EOF
  -s/[\\&%]/\\&/g
  -s%[\\$`]%\\&%g
  -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
  -s%ac_d%ac_u%gp
  -s%ac_u%ac_e%gp
  -EOF
  -sed -n -f conftest.hdr confdefs.h > conftest.vals
  -rm -f conftest.hdr
  -
  -# This sed command replaces #undef with comments.  This is necessary, for
  -# example, in the case of _POSIX_SOURCE, which is predefined and required
  -# on some systems where configure will not decide to define it.
  -cat >> conftest.vals <<\EOF
  -s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
  -EOF
  -
  -# Break up conftest.vals because some shells have a limit on
  -# the size of here documents, and old seds have small limits too.
  -
  -rm -f conftest.tail
  -while :
  -do
  -  ac_lines=`grep -c . conftest.vals`
  -  # grep -c gives empty output for an empty file on some AIX systems.
  -  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
  -  # Write a limited-size here document to conftest.frag.
  -  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
  -  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
  -  echo 'CEOF
  -  sed -f conftest.frag conftest.in > conftest.out
  -  rm -f conftest.in
  -  mv conftest.out conftest.in
  -' >> $CONFIG_STATUS
  -  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
  -  rm -f conftest.vals
  -  mv conftest.tail conftest.vals
  -done
  -rm -f conftest.vals
  -
  -cat >> $CONFIG_STATUS <<\EOF
  -  rm -f conftest.frag conftest.h
  -  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
  -  cat conftest.in >> conftest.h
  -  rm -f conftest.in
  -  if cmp -s $ac_file conftest.h 2>/dev/null; then
  -    echo "$ac_file is unchanged"
  -    rm -f conftest.h
  -  else
  -    # Remove last slash and all that follows it.  Not all systems have dirname.
  -      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
  -      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
  -      # The file is in a subdirectory.
  -      test ! -d "$ac_dir" && mkdir "$ac_dir"
  -    fi
  -    rm -f $ac_file
  -    mv conftest.h $ac_file
  -  fi
  -fi; done
   
   EOF
   cat >> $CONFIG_STATUS <<EOF
  
  
  
  1.15      +2 -0      xml-xerces/c/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/configure.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- configure.in	2000/03/20 23:48:50	1.14
  +++ configure.in	2000/08/01 18:26:30	1.15
  @@ -45,6 +45,7 @@
           *-*-mvs*)       platform=OS390 ;;
           *-*-os400*)     platform=OS400 ;;
           *-*-OS400*)     platform=OS400 ;;
  +        *-*-osf*)	platform=TRU64 ;;
           *)              platform=UNKNOWN ;;
   esac
   AC_SUBST(platform)
  @@ -101,6 +102,7 @@
   util/Platforms/OS400/Makefile \
   util/Platforms/IRIX/Makefile \
   util/Platforms/UnixWare/Makefile \
  +util/Platforms/Tru64/Makefile \
   util/Compilers/Makefile \
   util/MsgLoaders/InMemory/Makefile \
   util/MsgLoaders/ICU/Makefile \
  
  
  
  1.31      +14 -1     xml-xerces/c/src/Makefile.incl
  
  Index: Makefile.incl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Makefile.incl	2000/07/27 17:44:38	1.30
  +++ Makefile.incl	2000/08/01 18:26:30	1.31
  @@ -54,7 +54,7 @@
   # <http://www.apache.org/>.
   #
   #
  -# $Id: Makefile.incl,v 1.30 2000/07/27 17:44:38 aruna1 Exp $
  +# $Id: Makefile.incl,v 1.31 2000/08/01 18:26:30 aruna1 Exp $
   #
   
   ###################################################################
  @@ -354,6 +354,19 @@
   EXTRA_LINK_OPTIONS =
   SHLIBSUFFIX=.dll
   OS390SIDEDECK=.x
  +endif
  +
  +#=============== TRU64 SPECIFIC OPTIONS =========================
  +ifeq (${PLATFORM}, TRU64)
  +PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -ptr ${XERCESCROOT}/.cxx_repository
  +MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -ptr ${XERCESCROOT}/.cxx_repository
  +MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
  +ifeq (${TRANSCODER}, ICU)
  +	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licu-uc -licudata -lc -lrt
  +else
  +	ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc -lrt
  +endif
  +SHLIBSUFFIX=.so
   endif
   
   ###################### STANDARD TOOLS #############################
  
  
  
  1.33      +4 -4      xml-xerces/c/src/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/runConfigure,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- runConfigure	2000/07/19 19:43:54	1.32
  +++ runConfigure	2000/08/01 18:26:30	1.33
  @@ -55,7 +55,7 @@
   # <http://www.apache.org/>.
   #
   #
  -# $Id: runConfigure,v 1.32 2000/07/19 19:43:54 aruna1 Exp $
  +# $Id: runConfigure,v 1.33 2000/08/01 18:26:30 aruna1 Exp $
   #
   #
   
  @@ -79,7 +79,7 @@
       echo "Usage: runConfigure \"options\""
       echo "       where options may be any of the following:"
       echo "       -p <platform> (accepts 'aix', 'linux', 'solaris',
  -            'hp-10', 'hp-11', 'unixware', 'os400', 'irix', 'ptx' )"
  +            'hp-10', 'hp-11', 'unixware', 'os400', 'irix', 'ptx', 'tru64' )"
       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)"
  @@ -201,7 +201,7 @@
   #
   
   case $platform in
  -   aix | linux | solaris | hp-10 | hp-11 | irix | unixware | os400 | ptx)
  +   aix | linux | solaris | hp-10 | hp-11 | irix | unixware | os400 | ptx | tru64)
          # platform has been recognized
          ;;
      *)
  @@ -398,7 +398,7 @@
   #
   
   case $cppcompiler in
  -   xlC | xlc | xlC_r | xlc_r | g++ | c++ | cc | CC | aCC | icc | ICC)
  +   xlC | xlc | xlC_r | xlc_r | g++ | c++ | cc | CC | aCC | icc | ICC | cxx)
         ;;
   
      *)