[Benson-commit] CVS: benson2 Makefile.in,1.3,1.4 aclocal.m4,1.5,1.6 config.guess,1.1.1.1,1.2 config.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/benson/benson2
In directory usw-pr-cvs1:/tmp/cvs-serv13579

Modified Files:
	Makefile.in aclocal.m4 config.guess config.h.in config.sub 
	configure configure.in ltmain.sh 
Log Message:
Several changes to the build environment

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson2/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2001/05/29 05:05:15	1.3
--- Makefile.in	2001/06/03 23:33:40	1.4
***************
*** 64,77 ****
  CXX = @CXX@
  DLLTOOL = @DLLTOOL@
  HAVE_X11 = @HAVE_X11@
- LD = @LD@
  LIBTOOL = @LIBTOOL@
  LIBTOOL_VERSION = @LIBTOOL_VERSION@
  LN_S = @LN_S@
  MAKEINFO = @MAKEINFO@
- NM = @NM@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  idl = @idl@
--- 64,79 ----
  CXX = @CXX@
  DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
  HAVE_X11 = @HAVE_X11@
  LIBTOOL = @LIBTOOL@
  LIBTOOL_VERSION = @LIBTOOL_VERSION@
  LN_S = @LN_S@
  MAKEINFO = @MAKEINFO@
  OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
+ STRIP = @STRIP@
  VERSION = @VERSION@
  idl = @idl@

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson2/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** aclocal.m4	2001/05/29 05:05:15	1.5
--- aclocal.m4	2001/06/03 23:33:40	1.6
***************
*** 172,175 ****
--- 172,183 ----
  	fi

+ 	AC_MSG_CHECKING(for ssliiop support)
+ 	if test "x$ssliiop" = "x" ; then
+ 		AC_MSG_RESULT(not found)
+ 	else
+ 		AC_MSG_RESULT(found)
+ 		LDFLAGS="-L$ssldir/lib $LDFLAGS"
+ 	fi
[...3648 lines suppressed...]
! AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl

! dnl This is just to silence aclocal about the macro not being used
! ifelse([AC_DISABLE_FAST_INSTALL])dnl

--- 3935,3948 ----
  ])

! # old names
! AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
! AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
! AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
! AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
! AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
! AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
! AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])

! # This is just to silence aclocal about the macro not being used
! ifelse([AC_DISABLE_FAST_INSTALL])

Index: config.guess
===================================================================
RCS file: /cvsroot/benson/benson2/config.guess,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config.guess	2001/03/23 03:13:24	1.1.1.1
--- config.guess	2001/06/03 23:33:40	1.2
***************
*** 1,7 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  #   Free Software Foundation, Inc.
! #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
[...1094 lines suppressed...]
+ /bin/universe          = `(/bin/universe) 2>/dev/null`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+ /bin/arch              = `(/bin/arch) 2>/dev/null`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+ UNAME_MACHINE = ${UNAME_MACHINE}
+ UNAME_RELEASE = ${UNAME_RELEASE}
+ UNAME_SYSTEM  = ${UNAME_SYSTEM}
+ UNAME_VERSION = ${UNAME_VERSION}
+ EOF
+ 
  exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

Index: config.h.in
===================================================================
RCS file: /cvsroot/benson/benson2/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config.h.in	2001/05/29 05:05:15	1.2
--- config.h.in	2001/06/03 23:33:40	1.3
***************
*** 10,13 ****
--- 10,19 ----
  #undef HAVE_PERL_EVAL_PV

+ /* Define if you have the <dlfcn.h> header file.  */
+ #undef HAVE_DLFCN_H
+ 
+ /* Define if you have the compat library (-lcompat).  */
+ #undef HAVE_LIBCOMPAT
+ 
  /* Define if you have the dl library (-ldl).  */
  #undef HAVE_LIBDL

Index: config.sub
===================================================================
RCS file: /cvsroot/benson/benson2/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config.sub	2001/03/23 03:13:24	1.1.1.1
--- config.sub	2001/06/03 23:33:40	1.2
***************
*** 1,7 ****
  #! /bin/sh
! # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  #   Free Software Foundation, Inc.
! #
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 1,9 ----
  #! /bin/sh
! # Configuration validation subroutine script.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  #   Free Software Foundation, Inc.
! 
! timestamp='2001-04-20'
! 
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
***************
*** 28,32 ****
  # the same distribution terms that you use for the rest of that program.

- # Written by Per Bothner <bo...@cy...>.
  # Please send patches to <con...@gn...>.
  #
--- 30,33 ----
***************
*** 51,71 ****
  # It is wrong to echo any other type of specification.

! if [ x$1 = x ]
! then
! 	echo Configuration name missing. 1>&2
! 	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
! 	echo "or     $0 ALIAS" 1>&2
! 	echo where ALIAS is a recognized configuration type. 1>&2
! 	exit 1
! fi

! # First pass through any local machine types.
! case $1 in
! 	*local*)
! 		echo $1
! 		exit 0
! 		;;
! 	*)
! 	;;
  esac

--- 52,115 ----
  # It is wrong to echo any other type of specification.

! me=`echo "$0" | sed -e 's,.*/,,'`

! usage="\
! Usage: $0 [OPTION] CPU-MFR-OPSYS
!        $0 [OPTION] ALIAS
! 
! Canonicalize a configuration name.
! 
! Operation modes:
!   -h, --help         print this help, then exit
!   -t, --time-stamp   print date of last modification, then exit
!   -v, --version      print version number, then exit
! 
! Report bugs and patches to <con...@gn...>."
! 
! version="\
! GNU config.sub ($timestamp)
! 
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! Free Software Foundation, Inc.
! 
! This is free software; see the source for copying conditions.  There is NO
! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
! 
! help="
! Try \`$me --help' for more information."
! 
! # Parse command line
! while test $# -gt 0 ; do
!   case $1 in
!     --time-stamp | --time* | -t )
!        echo "$timestamp" ; exit 0 ;;
!     --version | -v )
!        echo "$version" ; exit 0 ;;
!     --help | --h* | -h )
!        echo "$usage"; exit 0 ;;
!     -- )     # Stop option processing
!        shift; break ;;
!     - )	# Use stdin as input.
!        break ;;
!     -* )
!        echo "$me: invalid option $1$help"
!        exit 1 ;;
! 
!     *local*)
!        # First pass through any local machine types.
!        echo $1
!        exit 0;;
! 
!     * )
!        break ;;
!   esac
! done
! 
! case $# in
!  0) echo "$me: missing argument$help" >&2
!     exit 1;;
!  1) ;;
!  *) echo "$me: too many arguments$help" >&2
!     exit 1;;
  esac

***************
*** 74,78 ****
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
--- 118,122 ----
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 100,104 ****
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple)
  		os=
  		basic_machine=$1
--- 144,148 ----
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis)
  		os=
  		basic_machine=$1
***************
*** 172,193 ****
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
! 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
! 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
  		| 580 | i960 | h8300 \
! 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
  		| hppa64 \
  		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
  		| alphaev6[78] \
! 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
! 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
! 		| mips64vr5000 | miprs64vr5000el | mcore \
! 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
! 		| thumb | d10v | fr30 | avr)
  		basic_machine=$basic_machine-unknown
  		;;
! 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
  		;;

--- 216,247 ----
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
! 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
! 	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
! 		| pyramid | mn10200 | mn10300 | tron | a29k \
  		| 580 | i960 | h8300 \
! 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
  		| hppa64 \
  		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
  		| alphaev6[78] \
! 		| we32k | ns16k | clipper | i370 | sh | sh[34] \
! 		| powerpc | powerpcle \
! 		| 1750a | dsp16xx | pdp10 | pdp11 \
! 		| mips16 | mips64 | mipsel | mips64el \
  		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
  		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
! 		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
! 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
! 		| v850 | c4x \
! 		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
! 		| pj | pjl | h8500)
  		basic_machine=$basic_machine-unknown
  		;;
! 	m6811 | m68hc11 | m6812 | m68hc12)
! 		# Motorola 68HC11/12.
! 		basic_machine=$basic_machine-unknown
! 		os=-none
! 		;;
! 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
  		;;

***************
*** 195,199 ****
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i[34567]86)
  	  basic_machine=$basic_machine-pc
  	  ;;
--- 249,253 ----
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
! 	i*86 | x86_64)
  	  basic_machine=$basic_machine-pc
  	  ;;
***************
*** 205,214 ****
  	# Recognize the basic CPU types with company name.
  	# FIXME: clean up the formatting here.
! 	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
  	      | xmp-* | ymp-* \
! 	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
  	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
  	      | hppa2.0n-* | hppa64-* \
--- 259,269 ----
  	# Recognize the basic CPU types with company name.
  	# FIXME: clean up the formatting here.
! 	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
! 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
! 	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
  	      | xmp-* | ymp-* \
! 	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
  	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
  	      | hppa2.0n-* | hppa64-* \
***************
*** 217,229 ****
  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
  	      | clipper-* | orion-* \
! 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
! 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
  	      | mips64el-* | mips64orion-* | mips64orionel-* \
  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
  	      | mipstx39-* | mipstx39el-* | mcore-* \
! 	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
! 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
! 	      | bs2000-*)
  		;;
  	# Recognize the various machine names and aliases which stand
--- 272,286 ----
  	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
  	      | clipper-* | orion-* \
! 	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
! 	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
! 	      | mips16-* | mips64-* | mipsel-* \
  	      | mips64el-* | mips64orion-* | mips64orionel-* \
  	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
  	      | mipstx39-* | mipstx39el-* | mcore-* \
! 	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
! 	      | [cjt]90-* \
  	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
! 	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
! 	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
  		;;
  	# Recognize the various machine names and aliases which stand
***************
*** 262,273 ****
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-cbm
  		;;
  	amigaos | amigados)
! 		basic_machine=m68k-cbm
  		os=-amigaos
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-cbm
  		os=-sysv4
  		;;
--- 319,330 ----
  		;;
  	amiga | amiga-*)
! 		basic_machine=m68k-unknown
  		;;
  	amigaos | amigados)
! 		basic_machine=m68k-unknown
  		os=-amigaos
  		;;
  	amigaunix | amix)
! 		basic_machine=m68k-unknown
  		os=-sysv4
  		;;
***************
*** 316,321 ****
  		os=-unicos
  		;;
! 	[ctj]90-cray)
! 		basic_machine=c90-cray
  		os=-unicos
  		;;
--- 373,378 ----
  		os=-unicos
  		;;
! 	[cjt]90)
! 		basic_machine=${basic_machine}-cray
  		os=-unicos
  		;;
***************
*** 323,326 ****
--- 380,386 ----
  		basic_machine=m68k-crds
  		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
***************
*** 370,373 ****
--- 430,437 ----
  		os=-sysv
  		;;
+ 	go32)
+ 		basic_machine=i386-pc
+ 		os=-go32
+ 		;;
  	h3050r* | hiux*)
  		basic_machine=hppa1.1-hitachi
***************
*** 445,461 ****
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i[34567]86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i[34567]86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i[34567]86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i[34567]86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
--- 509,525 ----
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
! 	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
! 	i*86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
! 	i*86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
! 	i*86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
***************
*** 469,480 ****
  		os=-vsta
  		;;
- 	i386-go32 | go32)
- 		basic_machine=i386-unknown
- 		os=-go32
- 		;;
- 	i386-mingw32 | mingw32)
- 		basic_machine=i386-unknown
- 		os=-mingw32
- 		;;
  	iris | iris4d)
  		basic_machine=mips-sgi
--- 533,536 ----
***************
*** 502,505 ****
--- 558,565 ----
  		os=-sysv
  		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
  	miniframe)
  		basic_machine=m68000-convergent
***************
*** 532,536 ****
  		;;
  	msdos)
! 		basic_machine=i386-unknown
  		os=-msdos
  		;;
--- 592,596 ----
  		;;
  	msdos)
! 		basic_machine=i386-pc
  		os=-msdos
  		;;
***************
*** 596,599 ****
--- 656,663 ----
  		os=-mon960
  		;;
+ 	nonstopux)
+ 		basic_machine=mips-compaq
+ 		os=-nonstopux
+ 		;;
  	np1)
  		basic_machine=np1-gould
***************
*** 631,656 ****
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexen)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
! 		basic_machine=i786-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-* | 6x86-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumii-* | pentium2-*)
! 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
! 	power)	basic_machine=rs6000-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
--- 695,720 ----
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexgen)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
! 		basic_machine=i686-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
! 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumii-* | pentium2-*)
! 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
! 	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
***************
*** 667,670 ****
--- 731,738 ----
  		basic_machine=i386-ibm
  		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
  	rom68k)
  		basic_machine=m68k-rom68k
***************
*** 758,761 ****
--- 826,833 ----
  		os=-unicos
  		;;
+ 	tic54x | c54x*)
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
***************
*** 853,856 ****
--- 925,932 ----
  		basic_machine=vax-dec
  		;;
+ 	pdp10)
+ 		# there are many clones, so DEC is not a safe bet
+ 		basic_machine=pdp10-unknown
+ 		;;
  	pdp11)
  		basic_machine=pdp11-dec
***************
*** 859,863 ****
  		basic_machine=we32k-att
  		;;
! 	sparc | sparcv9)
  		basic_machine=sparc-sun
  		;;
--- 935,942 ----
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4)
! 		basic_machine=sh-unknown
! 		;;
! 	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
***************
*** 881,884 ****
--- 960,966 ----
  		os=-coff
  		;;
+ 	*-unknown)
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
  	*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
***************
*** 940,949 ****
  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
! 	      | -openstep* | -oskit*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
  		case $basic_machine in
! 		    x86-* | i[34567]86-*)
  			;;
  		    *)
--- 1022,1032 ----
  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
! 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
! 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
  		case $basic_machine in
! 		    x86-* | i*86-*)
  			;;
  		    *)
***************
*** 1001,1005 ****
  	        os=-nextstep2
  		;;
! 	-nsk)
  		os=-nsk
  		;;
--- 1084,1088 ----
  	        os=-nextstep2
  		;;
! 	-nsk*)
  		os=-nsk
  		;;
***************
*** 1038,1042 ****
  		os=-xenix
  		;;
!         -*mint | -*MiNT)
  	        os=-mint
  		;;
--- 1121,1125 ----
  		os=-xenix
  		;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  	        os=-mint
  		;;
***************
*** 1072,1075 ****
--- 1155,1161 ----
  		os=-aout
  		;;
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
          pdp11-*)
  		os=-none
***************
*** 1180,1184 ****
  		os=-rtu
  		;;
! 	f301-fujitsu)
  		os=-uxpv
  		;;
--- 1266,1270 ----
  		os=-rtu
  		;;
! 	f30[01]-fujitsu | f700-fujitsu)
  		os=-uxpv
  		;;
***************
*** 1258,1262 ****
  				vendor=apple
  				;;
! 			-*mint | -*MiNT)
  				vendor=atari
  				;;
--- 1344,1348 ----
  				vendor=apple
  				;;
! 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  				vendor=atari
  				;;
***************
*** 1267,1268 ****
--- 1353,1362 ----

  echo $basic_machine$os
+ exit 0
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson2/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** configure	2001/05/29 05:05:15	1.6
--- configure	2001/06/03 23:33:40	1.7
***************
*** 20,37 ****
  ac_help="$ac_help
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
  ac_help="$ac_help
    --disable-libtool-lock  avoid locking (might break parallel builds)"
  ac_help="$ac_help
    --with-x                use the X Window System"
  ac_help="$ac_help
!   --with-mico=dir                 Find MICO installation below dir"
  ac_help="$ac_help
!   --with-omniorb=dir              Find omniORB installation below dir"
[...6020 lines suppressed...]
  s%@LN_S@%$LN_S%g
  s%@LIBTOOL@%$LIBTOOL%g
  s%@LIBTOOL_VERSION@%$LIBTOOL_VERSION%g
- s%@CPP@%$CPP%g
  s%@X_CFLAGS@%$X_CFLAGS%g
  s%@X_PRE_LIBS@%$X_PRE_LIBS%g
--- 7409,7421 ----
  s%@build_vendor@%$build_vendor%g
  s%@build_os@%$build_os%g
  s%@LN_S@%$LN_S%g
+ s%@OBJEXT@%$OBJEXT%g
+ s%@EXEEXT@%$EXEEXT%g
+ s%@ECHO@%$ECHO%g
+ s%@RANLIB@%$RANLIB%g
+ s%@STRIP@%$STRIP%g
+ s%@CPP@%$CPP%g
  s%@LIBTOOL@%$LIBTOOL%g
  s%@LIBTOOL_VERSION@%$LIBTOOL_VERSION%g
  s%@X_CFLAGS@%$X_CFLAGS%g
  s%@X_PRE_LIBS@%$X_PRE_LIBS%g

Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson2/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure.in	2001/06/03 22:40:45	1.5
--- configure.in	2001/06/03 23:33:40	1.6
***************
*** 59,92 ****
  dnl *********************************************************************

! if test "$perl" = yes; then
!   AC_PATH_PROG(perlpath, perl)
!   AC_MSG_CHECKING(for Perl compile flags)
!   PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
!   if test "_$PERL_CFLAGS" = _ ; then
!     AC_MSG_RESULT([not found, building without perl.])
!     perl=no
!     exit
!   else
!     PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts |$sedpath 's/-lgdbm //'`
!     PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
!     PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
!     if test "$system" = "Linux"; then
!       PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
!       PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
!     fi
!     PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
!     AC_MSG_RESULT(ok)
!     CXXFLAGS="$CXXFLAGS $PERL_CFLAGS"
!     LIBS=`echo "$LIBS $PERL_LDFLAGS" | $sedpath 's/ \+/ /g'`
!     LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
!     AC_DEFINE(USE_PERL)
!     AC_CHECK_FUNCS(perl_eval_pv)
!     (cd src/modules/Handlers;perl Makefile.PL)
!     (cd src/modules/Server;perl Makefile.PL)
!     (cd src/modules/Benson;perl Makefile.PL)
!   fi
  fi

! echo $LIBS

  AC_OUTPUT(Makefile src/perl/Makefile src/corba/Makefile \
--- 59,94 ----
  dnl *********************************************************************

! AC_PATH_PROG(perlpath, perl)
! AC_MSG_CHECKING(for Perl compile flags)
! PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
! if test "_$PERL_CFLAGS" = _ ; then
! 	AC_MSG_RESULT([not found, building without perl.])
! 	perl=no
! 	exit
! else
! 	PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts |$sedpath 's/-lgdbm //'`
! 	PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! 	PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! 	if test "$system" = "Linux"; then
! 		PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! 		PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! 	fi
! 	PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
! 	AC_MSG_RESULT(ok)
! 	CXXFLAGS="$CXXFLAGS $PERL_CFLAGS"
! 	LIBS=`echo "$LIBS $PERL_LDFLAGS" | $sedpath 's/ \+/ /g'`
! 	LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
! 	AC_DEFINE(USE_PERL)
! 	AC_CHECK_FUNCS(perl_eval_pv)
! 	(cd src/modules/Handlers;perl Makefile.PL)
! 	(cd src/modules/Server;perl Makefile.PL)
! 	(cd src/modules/Benson;perl Makefile.PL)
  fi

! if test "x$debug" = "x"; then
! 	CXXFLAGS=`echo $CXXFLAGS | $sedpath 's/\-g //g'`
! else
! 	CXXFLAGS="$CXXFLAGS -g"
! fi

  AC_OUTPUT(Makefile src/perl/Makefile src/corba/Makefile \

Index: ltmain.sh
===================================================================
RCS file: /cvsroot/benson/benson2/ltmain.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ltmain.sh	2001/03/23 03:13:27	1.1.1.1
--- ltmain.sh	2001/06/03 23:33:40	1.2
***************
*** 1,6 ****
  # ltmain.sh - Provide generalized library-building support services.
! # NOTE: Changing this file will not affect anything until you rerun ltconfig.
  #
! # Copyright (C) 1996-1999 Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <go...@gn...>, 1996
  #
--- 1,7 ----
  # ltmain.sh - Provide generalized library-building support services.
! # NOTE: Changing this file will not affect anything until you rerun configure.
  #
[...4292 lines suppressed...]
  compile)
    $echo \
***************
*** 3888,3891 ****
--- 4806,4811 ----

    -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+   -prefer-pic       try to building PIC objects only
+   -prefer-non-pic   try to building non-PIC objects only
    -static           always build a \`.o' file suitable for static linking

***************
*** 3967,3970 ****
--- 4887,4892 ----
    -lNAME            OUTPUT-FILE requires the installed library libNAME
    -module           build a library that can dlopened
+   -no-fast-install  disable the fast-install mode
+   -no-install       link a not-installable executable
    -no-undefined     declare that a library does not refer to external symbols
    -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects

[Benson-commit] CVS: benson2 Makefile.in,1.3,1.4 aclocal.m4,1.5,1.6 config.guess,1.1.1.1,1.2 config.

[Benson-commit] CVS: benson2 Makefile.in,1.3,1.4 aclocal.m4,1.5,1.6 config.guess,1.1.1.1,1.2 config.h.in,1.2,1.3 config.sub,1.1.1.1,1.2 configure,1.6,1.7 configure.in,1.5,1.6 ltmain.sh,1.1.1.1,1.2