OSSP CVS Repository

ossp - Check-in [380]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 380
Date: 2001-Feb-12 15:50:11 (local)
2001-Feb-12 14:50:11 (UTC)
User:rse
Branch:
Comment: Upgrade development scripts
Tickets:
Inspections:
Files:
ossp-pkg/sfio/.configure      added-> 1.3
ossp-pkg/sfio/aclocal.m4      added-> 1.2
ossp-pkg/sfio/configure.in      added-> 1.10
ossp-pkg/sfio/etc/config.guess      1.2 -> 1.3     591 inserted, 157 deleted
ossp-pkg/sfio/etc/config.sub      1.2 -> 1.3     203 inserted, 70 deleted
ossp-pkg/sfio/etc/shtool      1.3 -> 1.4     74 inserted, 52 deleted

ossp-pkg/sfio/.configure -> 1.3

*** /dev/null    Wed May  1 03:52:11 2024
--- -    Wed May  1 03:53:36 2024
***************
*** 0 ****
--- 1,8 ----
+ #!/bin/sh
+ CC="ggcc" \
+ CFLAGS="-pipe -O2 -Wall -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline" \
+ ./configure \
+ --prefix=/sw/pkg/sfio \
+ --with-stdio-src \
+ --with-stdio-bin \
+ "$@"


ossp-pkg/sfio/aclocal.m4 -> 1.2

*** /dev/null    Wed May  1 03:52:11 2024
--- -    Wed May  1 03:53:36 2024
***************
*** 0 ****
--- 1,434 ----
+ ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+ ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ ##
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+ ## the Free Software Foundation; either version 2 of the License, or
+ ## (at your option) any later version.
+ ##
+ ## This program is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ ## General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##
+ ## As a special exception to the GNU General Public License, if you
+ ## distribute this file as part of a program that contains a
+ ## configuration script generated by Autoconf, you may include it under
+ ## the same distribution terms that you use for the rest of that program.
+ 
+ # serial 40 AC_PROG_LIBTOOL
+ AC_DEFUN(AC_PROG_LIBTOOL,
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ 
+ # Save cache, so that ltconfig can load it
+ AC_CACHE_SAVE
+ 
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+ || AC_MSG_ERROR([libtool configure failed])
+ 
+ # Reload cache, that may have been modified by ltconfig
+ AC_CACHE_LOAD
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
+ ])
+ 
+ AC_DEFUN(AC_LIBTOOL_SETUP,
+ [AC_PREREQ(2.13)dnl
+ AC_REQUIRE([AC_ENABLE_SHARED])dnl
+ AC_REQUIRE([AC_ENABLE_STATIC])dnl
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_LD])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ dnl
+ 
+ case "$target" in
+ NONE) lt_target="$host" ;;
+ *) lt_target="$target" ;;
+ esac
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+ test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+ test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+ [libtool_flags="$libtool_flags --enable-dlopen"])
+ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+ [libtool_flags="$libtool_flags --enable-win32-dll"])
+ AC_ARG_ENABLE(libtool-lock,
+   [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       LD="${LD-ld} -32"
+       ;;
+     *N32*)
+       LD="${LD-ld} -n32"
+       ;;
+     *64-bit*)
+       LD="${LD-ld} -64"
+       ;;
+     esac
+   fi
+   rm -rf conftest*
+   ;;
+ 
+ *-*-sco3.2v5*)
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+     [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
+ 
+ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+   ;;
+ ])
+ esac
+ ])
+ 
+ # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+ AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+ 
+ # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+ AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+ 
+ # AC_ENABLE_SHARED - implement the --enable-shared flag
+ # Usage: AC_ENABLE_SHARED[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+ AC_DEFUN(AC_ENABLE_SHARED, [dnl
+ define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(shared,
+ changequote(<<, >>)dnl
+ <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+ case "$enableval" in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+   enable_shared=no
+   # Look at the argument we got.  We use all the common list separators.
+   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+   for pkg in $enableval; do
+     if test "X$pkg" = "X$p"; then
+       enable_shared=yes
+     fi
+   done
+   IFS="$ac_save_ifs"
+   ;;
+ esac],
+ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+ ])
+ 
+ # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+ AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)])
+ 
+ # AC_ENABLE_STATIC - implement the --enable-static flag
+ # Usage: AC_ENABLE_STATIC[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+ AC_DEFUN(AC_ENABLE_STATIC, [dnl
+ define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(static,
+ changequote(<<, >>)dnl
+ <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+ case "$enableval" in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+   enable_static=no
+   # Look at the argument we got.  We use all the common list separators.
+   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+   for pkg in $enableval; do
+     if test "X$pkg" = "X$p"; then
+       enable_static=yes
+     fi
+   done
+   IFS="$ac_save_ifs"
+   ;;
+ esac],
+ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+ ])
+ 
+ # AC_DISABLE_STATIC - set the default static flag to --disable-static
+ AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_STATIC(no)])
+ 
+ 
+ # AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+ # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+ AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+ define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(fast-install,
+ changequote(<<, >>)dnl
+ <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+ case "$enableval" in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+   enable_fast_install=no
+   # Look at the argument we got.  We use all the common list separators.
+   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+   for pkg in $enableval; do
+     if test "X$pkg" = "X$p"; then
+       enable_fast_install=yes
+     fi
+   done
+   IFS="$ac_save_ifs"
+   ;;
+ esac],
+ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+ ])
+ 
+ # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+ AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)])
+ 
+ # AC_PROG_LD - find the path to the GNU or non-GNU linker
+ AC_DEFUN(AC_PROG_LD,
+ [AC_ARG_WITH(gnu-ld,
+ [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ ac_prog=ld
+ if test "$ac_cv_prog_gcc" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by GCC])
+   ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+ changequote(,)dnl
+     [\\/]* | [A-Za-z]:[\\/]*)
+       re_direlt='/[^/][^/]*/\.\./'
+ changequote([,])dnl
+       # Canonicalize the path of ld
+       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+   "")
+     # If it fails, then pretend we aren't using GCC.
+     ac_prog=ld
+     ;;
+   *)
+     # If it is relative, then search for the first ld in PATH.
+     with_gnu_ld=unknown
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+   AC_MSG_CHECKING([for GNU ld])
+ else
+   AC_MSG_CHECKING([for non-GNU ld])
+ fi
+ AC_CACHE_VAL(ac_cv_path_LD,
+ [if test -z "$LD"; then
+   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       ac_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+        test "$with_gnu_ld" != no && break
+       else
+        test "$with_gnu_ld" != yes && break
+       fi
+     fi
+   done
+   IFS="$ac_save_ifs"
+ else
+   ac_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+ LD="$ac_cv_path_LD"
+ if test -n "$LD"; then
+   AC_MSG_RESULT($LD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_PROG_LD_GNU
+ ])
+ 
+ AC_DEFUN(AC_PROG_LD_GNU,
+ [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+   ac_cv_prog_gnu_ld=yes
+ else
+   ac_cv_prog_gnu_ld=no
+ fi])
+ ])
+ 
+ # AC_PROG_NM - find the path to a BSD-compatible name lister
+ AC_DEFUN(AC_PROG_NM,
+ [AC_MSG_CHECKING([for BSD-compatible nm])
+ AC_CACHE_VAL(ac_cv_path_NM,
+ [if test -n "$NM"; then
+   # Let the user override the test.
+   ac_cv_path_NM="$NM"
+ else
+   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+        ac_cv_path_NM="$ac_dir/nm -B"
+        break
+       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+        ac_cv_path_NM="$ac_dir/nm -p"
+        break
+       else
+        ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+        continue # so that we can try to find one that supports BSD flags
+       fi
+     fi
+   done
+   IFS="$ac_save_ifs"
+   test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+ fi])
+ NM="$ac_cv_path_NM"
+ AC_MSG_RESULT([$NM])
+ ])
+ 
+ # AC_CHECK_LIBM - check for math library
+ AC_DEFUN(AC_CHECK_LIBM,
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case "$lt_target" in
+ *-*-beos* | *-*-cygwin*)
+   # These system don't have libm
+   ;;
+ *-ncr-sysv4.3*)
+   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+   AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+   ;;
+ *)
+   AC_CHECK_LIB(m, main, LIBM="-lm")
+   ;;
+ esac
+ ])
+ 
+ # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+ # the libltdl convenience library and INCLTDL to the include flags for
+ # the libltdl header and adds --enable-ltdl-convenience to the
+ # configure arguments.  Note that LIBLTDL and INCLTDL are not
+ # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+ # provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+ # with '${top_builddir}/' and INCLTDL will be prefixed with
+ # '${top_srcdir}/' (note the single quotes!).  If your package is not
+ # flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case "$enable_ltdl_convenience" in
+   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+   esac
+   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+   INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ ])
+ 
+ # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+ # the libltdl installable library and INCLTDL to the include flags for
+ # the libltdl header and adds --enable-ltdl-install to the configure
+ # arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
+ # AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+ # libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+ # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
+ # with '${top_srcdir}/' (note the single quotes!).  If your package is
+ # not flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   AC_CHECK_LIB(ltdl, main,
+   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+   [if test x"$enable_ltdl_install" = xno; then
+      AC_MSG_WARN([libltdl not installed, but installation disabled])
+    else
+      enable_ltdl_install=yes
+    fi
+   ])
+   if test x"$enable_ltdl_install" = x"yes"; then
+     ac_configure_args="$ac_configure_args --enable-ltdl-install"
+     LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+     INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   else
+     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+     LIBLTDL="-lltdl"
+     INCLTDL=
+   fi
+ ])
+ 
+ dnl old names
+ AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+ AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+ AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+ AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+ 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


ossp-pkg/sfio/configure.in -> 1.10

*** /dev/null    Wed May  1 03:52:11 2024
--- -    Wed May  1 03:53:36 2024
***************
*** 0 ****
--- 1,78 ----
+ dnl ##
+ dnl ##   Autoconf specification for Sfio library
+ dnl ##
+ 
+ AC_PREREQ(2.13)dnl
+ AC_REVISION($Revision: 1.10 $)
+ 
+ SHTOOL="./etc/shtool"
+ AC_SUBST(SHTOOL)
+ T_MD=`$SHTOOL echo -n -e %B 2>/dev/null`
+ T_ME=`$SHTOOL echo -n -e %b 2>/dev/null`
+ SFIO_VERSION=`grep SFIO_VERSION sfio/sfio.h | head -1 | sed -e 's/.*SFIO_VERSION[[     ]]*//' -e 's/L[[        ]]*//'`
+ PACKAGE_VER=`grep PACKAGE_VER Makefile.in | head -1 | sed -e 's/.*PACKAGE_VER[[        ]]=[[   ]]*//'`
+ AC_SUBST(SFIO_VERSION)
+ AC_SUBST(PACKAGE_VER)
+ echo "Configuring ${T_MD}OSSP Sfio 1999${T_ME} (Safe/Fast IO Library), Version ${T_MD}${PACKAGE_VER}${T_ME}"
+ echo "Copyright (c) 1991-1999 David Korn, Kiem-Phong Vo and Glenn Fowler"
+ echo "Copyright (c) 1991-1999 AT&T Labs Research, All rights reserved"
+ echo "Copyright (c) 1999 The OSSP Project <ossp@ossp.org>"
+ echo ""
+ 
+ AC_INIT(README)
+ AC_CONFIG_AUX_DIR(etc)
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+ dnl AC_PROG_RANLIB
+ AC_PROG_LIBTOOL
+ AC_SET_MAKE
+ 
+ LIBS="-lsfio"
+ AC_ARG_WITH(stdio-src,dnl
+ [  --with-stdio-src        build with Stdio source emulation (default: no)],
+ STDIO_SRC="$withval",
+ STDIO_SRC=no
+ )dnl
+ AC_ARG_WITH(stdio-bin,dnl
+ [  --with-stdio-bin        build with Stdio binary emulation (default: no)],
+ STDIO_BIN="$withval",
+ STDIO_BIN=no
+ )dnl
+ LIBSTDIO_LA=""
+ O_STDIO_S=""
+ D_STDIO_S=""
+ D_STDIO_B=""
+ if test ".$STDIO_BIN" = .yes; then
+     D_STDIO_B='stdio_b'
+     LIBS="$LIBS -lstdio"
+     LIBSTDIO_LA="libstdio.la"
+ fi
+ if test ".$STDIO_SRC" = .yes; then
+     O_STDIO_S='$(STDIO_S)'
+     D_STDIO_S='stdio_s'
+ fi
+ AC_SUBST(STDIO_SRC)
+ AC_SUBST(STDIO_BIN)
+ AC_SUBST(LIBSTDIO_LA)
+ AC_SUBST(O_STDIO_S)
+ AC_SUBST(D_STDIO_S)
+ AC_SUBST(D_STDIO_B)
+ 
+ dnl # Now run Sfio's original IFFE stuff in the background
+ (cd sfio_c && make CC="$CC" CFLAGS="$CFLAGS")
+ 
+ AC_OUTPUT(dnl
+ Makefile dnl
+ sfio-config dnl
+ sfio/Makefile dnl
+ sfio_dc/Makefile dnl
+ sfio_f/Makefile dnl
+ sfio_t/Makefile dnl
+ stdio_b/Makefile dnl
+ stdio_s/Makefile dnl
+ ,dnl
+ chmod a+x sfio-config
+ )dnl
+ 


ossp-pkg/sfio/etc/config.guess 1.2 -> 1.3

--- config.guess 2000/07/03 14:15:16     1.2
+++ config.guess 2001/02/12 14:50:12     1.3
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-#
+
+timestamp='2001-01-17'
+
 # 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
 # the Free Software Foundation; either version 2 of the License, or
@@ -23,34 +25,97 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
+# don't specify an explicit build system type.
 #
 # Only a few systems have been added to this list; please add others
 # (but try to keep the structure clean).
 #
 
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
-  if test x"$HOST_CC" != x; then
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+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 <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+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" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
 fi
 
 
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c
+        for c in cc gcc c89 ; do
+          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+          if test $? = 0 ; then
+             CC_FOR_BUILD="$c"; break
+          fi
+        done
+        rm -f $dummy.c $dummy.o $dummy.rel
+        if test x"$CC_FOR_BUILD" = x ; then
+          CC_FOR_BUILD=no_compiler_found
+        fi
+        ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -59,15 +124,57 @@
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+        # Netbsd (nbsd) targets should (where applicable) match one or
+        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+        # switched to ELF, *-*-netbsd* would select the old
+        # object file format.  This provides both forward
+        # compatibility and a consistent mechanism for selecting the
+        # object file format.
+        # Determine the machine/vendor (is the vendor relevant).
+        case "${UNAME_MACHINE}" in
+            amiga) machine=m68k-unknown ;;
+            arm32) machine=arm-unknown ;;
+            atari*) machine=m68k-atari ;;
+            sun3*) machine=m68k-sun ;;
+            mac68k) machine=m68k-apple ;;
+            macppc) machine=powerpc-apple ;;
+            hp3[0-9][05]) machine=m68k-hp ;;
+            ibmrt|romp-ibm) machine=romp-ibm ;;
+            *) machine=${UNAME_MACHINE}-unknown ;;
+        esac
+        # The Operating System including object format, if it has switched
+        # to ELF recently, or will in the future.
+        case "${UNAME_MACHINE}" in
+            i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                        | grep __ELF__ >/dev/null
+                then
+                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                    # Return netbsd for either.  FIX?
+                    os=netbsd
+                else
+                    os=netbsdelf
+                fi
+                ;;
+            *)
+                os=netbsd
+                ;;
+        esac
+        # The OS release
+        release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+        # contains redundant information, the shorter form:
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}${release}"
+        exit 0 ;;
     alpha:OSF1:*:*)
         if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -77,41 +184,51 @@
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
         cat <<EOF >$dummy.s
+        .data
+\$Lformat:
+        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+        .text
         .globl main
+        .align 4
         .ent main
 main:
-        .frame \$30,0,\$26,0
-        .prologue 0
-        .long 0x47e03d80 # implver $0
-        lda \$2,259
-        .long 0x47e20c21 # amask $2,$1
-        srl \$1,8,\$2
-        sll \$2,2,\$2
-        sll \$0,3,\$0
-        addl \$1,\$0,\$0
-        addl \$2,\$0,\$0
-        ret \$31,(\$26),1
+        .frame \$30,16,\$26,0
+        ldgp \$29,0(\$27)
+        .prologue 1
+        .long 0x47e03d80 # implver \$0
+        lda \$2,-1
+        .long 0x47e20c21 # amask \$2,\$1
+        lda \$16,\$Lformat
+        mov \$0,\$17
+        not \$1,\$18
+        jsr \$26,printf
+        ldgp \$29,0(\$26)
+        mov 0,\$16
+        jsr \$26,exit
         .end main
 EOF
         $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
         if test "$?" = 0 ; then
-                ./$dummy
-                case "$?" in
-                        7)
+                case `./$dummy` in
+                        0-0)
                                 UNAME_MACHINE="alpha"
                                 ;;
-                        15)
+                        1-0)
                                 UNAME_MACHINE="alphaev5"
                                 ;;
-                        14)
+                        1-1)
                                 UNAME_MACHINE="alphaev56"
                                 ;;
-                        10)
+                        1-101)
                                 UNAME_MACHINE="alphapca56"
                                 ;;
-                        16)
+                        2-303)
                                 UNAME_MACHINE="alphaev6"
                                 ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
                 esac
         fi
         rm -f $dummy.s $dummy
@@ -127,11 +244,8 @@
         echo alpha-dec-winnt3.5
         exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-cbm-sysv4
+        echo m68k-unknown-sysv4
         exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
@@ -156,13 +270,13 @@
     wgrisc:OpenBSD:*:*)
         echo mipsel-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    *:OS/390:*:*)
+        echo i370-ibm-openedition
+        exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
         exit 0;;
-    arm32:NetBSD:*:*)
-        echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-        exit 0 ;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
         exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -218,9 +332,6 @@
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
         exit 0 ;;
-    atari*:NetBSD:*:*)
-        echo m68k-atari-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     atari*:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
@@ -250,15 +361,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:NetBSD:*:*)
-        echo m68k-sun-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     sun3*:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
-    mac68k:NetBSD:*:*)
-        echo m68k-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     mac68k:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
@@ -271,9 +376,6 @@
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
         exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
         exit 0 ;;
@@ -289,6 +391,7 @@
     mips:*:*:UMIPS | mips:*:*:RISCos)
         sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
         int main (int argc, char *argv[]) {
 #else
         int main (argc, argv) int argc; char *argv[]; {
@@ -328,15 +431,18 @@
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-        if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-             -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+        then
+            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+               [ ${TARGET_BINARY_INTERFACE}x = x ]
+            then
                 echo m88k-dg-dgux${UNAME_RELEASE}
-        else
+            else
                 echo m88k-dg-dguxbcs${UNAME_RELEASE}
+            fi
+        else
+            echo i586-dg-dgux${UNAME_RELEASE}
         fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
         exit 0 ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
@@ -396,13 +502,26 @@
         fi
         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
         exit 0 ;;
+    *:AIX:*:5)
+        case "`lsattr -El proc0 -a type -F value`" in
+            PowerPC*) IBM_ARCH=powerpc
+                      IBM_MANUF=ibm ;;
+            Itanium)  IBM_ARCH=ia64
+                      IBM_MANUF=unknown ;;
+            POWER*)   IBM_ARCH=power
+                      IBM_MANUF=ibm ;;
+            *)        IBM_ARCH=powerpc
+                      IBM_MANUF=ibm ;;
+        esac
+        echo ${IBM_ARCH}-${IBM_MANUF}-aix${UNAME_VERSION}.${UNAME_RELEASE}
+        exit 0 ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
         exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
         exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
         exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -418,11 +537,31 @@
         echo m68k-hp-bsd4.4
         exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         case "${UNAME_MACHINE}" in
             9000/31? )            HP_ARCH=m68000 ;;
             9000/[34]?? )         HP_ARCH=m68k ;;
             9000/[678][0-9][0-9])
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                        esac ;;
+                    esac
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
               sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -453,12 +592,17 @@
                   exit (0);
               }
 EOF
-        ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+        if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
         rm -f $dummy.c $dummy
+        fi ;;
         esac
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
         exit 0 ;;
+    ia64:HP-UX:*:*)
+        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+        echo ia64-hp-hpux${HPUX_REV}
+        exit 0 ;;
     3050*:HI-UX:*:*)
         sed 's/^        //' << EOF >$dummy.c
         #include <unistd.h>
@@ -547,29 +691,30 @@
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
         exit 0 ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos${UNAME_RELEASE}
+        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*T3D:*:*:*)
+        echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY*T3E:*:*:*)
-        echo t3e-cray-unicosmk${UNAME_RELEASE}
+        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        exit 0 ;;
+    CRAY*SV1:*:*:*)
+        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     CRAY-2:*:*:*)
         echo cray2-cray-unicos
         exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-        echo m68k-hp-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     hp300:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
         exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -579,25 +724,7 @@
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
         exit 0 ;;
     *:FreeBSD:*:*)
-        # echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        VERS=`echo ${UNAME_RELEASE} | sed -e 's/[-(].*//'`
-        MACH=`/sbin/sysctl -n hw.model`
-        ARCH='unknown'
-        case ${MACH} in
-           *386*       ) MACH="i386" ;;
-           *486*       ) MACH="i486" ;;
-           Pentium\ II*) MACH="i686" ;;
-           Pentium*    ) MACH="i586" ;;
-           Alpha*      ) MACH="alpha" ;;
-           *           ) MACH="$UNAME_MACHINE" ;;
-        esac
-        case ${MACH} in
-           i[0-9]86 ) ARCH="pc" ;;
-        esac
-        echo "${MACH}-${ARCH}-freebsd${VERS}"
-        exit 0 ;;
-    *:NetBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
     *:OpenBSD:*:*)
         echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
@@ -608,6 +735,9 @@
     i*:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
         exit 0 ;;
+    i*:PW*:*)
+        echo ${UNAME_MACHINE}-pc-pw32
+        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
         # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -626,61 +756,246 @@
     *:GNU:*:*)
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
         exit 0 ;;
+    i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit 0 ;;
     *:Linux:*:*)
-        # determine canonical machine name
-        MACHINE="$UNAME_MACHINE"
-        case "$MACHINE" in
-            arm*|sa110*) MACHINE="arm" ;;
-        esac
-
-        # determine (distribution) vendor
-        VENDOR="gnu"
-        for tagfile in dummy `cd /etc && echo *-release *_version 2>/dev/null`; do
-            test ! -f /etc/$tagfile && continue
-            VENDOR=`echo $tagfile | sed -e 's/-release$//' -e 's/_version$//' |\
-                    tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        done
 
-        # determine kernel version
-        KERNEL=`echo ${UNAME_RELEASE} | sed -e 's/^\([0-9]*\.[0-9]*\)\..*$/\1/'`
-
-        # determine [g]libc version
-        cat >$dummy.c <<EOF
-#include <stdio.h>
+        # The BFD linker knows what the default object file format is, so
+        # first see if it will tell us. cd to the root directory to prevent
+        # problems with other programs or directories called `ld' in the path.
+        ld_supported_emulations=`cd /; ld --help 2>&1 \
+                         | sed -ne '/supported emulations:/!d
+                                    s/[         ][      ]*/ /g
+                                    s/.*supported emulations: *//
+                                    s/ .*//
+                                    p'`
+        case "$ld_supported_emulations" in
+          *ia64)
+                echo "${UNAME_MACHINE}-unknown-linux"
+                exit 0
+                ;;
+          i?86linux)
+                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+                exit 0
+                ;;
+          elf_i?86)
+                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+                ;;
+          i?86coff)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                exit 0
+                ;;
+          sparclinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32_sparc)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+          armlinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32arm*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+                exit 0
+                ;;
+          armelf_linux*)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+          m68klinux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+                exit 0
+                ;;
+          elf32ppc | elf32ppclinux)
+                # Determine Lib Version
+                cat >$dummy.c <<EOF
 #include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
 main(argc, argv)
-int argc;
-char *argv[];
+     int argc;
+     char *argv[];
 {
-#if defined(__GLIBC__) && !defined(__GLIBC_MINOR__)
-    printf("%d", __GLIBC__);
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-    printf("%d.%d", __GLIBC__, __GLIBC_MINOR__);
-#elif defined(__GNU_LIBRARY__)
-    printf("%d", __GNU_LIBRARY__);
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
 #else
-    printf("1");
+  printf("unkown\n");
 #endif
-    return 0;
+  return 0;
 }
 EOF
-        LIBC="1"
-        $CC_FOR_BUILD $dummy.c -o $dummy # 2>/dev/null
-        if [ $? = 0 ]; then
-            LIBC=`./$dummy | sed -e 's/^\([0-9]*\.[0-9]*\)\..*$/\1/'`
-        fi
-        rm -f $dummy.c $dummy
+                LIBC=""
+                $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+                if test "$?" = 0 ; then
+                        ./$dummy | grep 1\.99 > /dev/null
+                        if test "$?" = 0 ; then
+                                LIBC="libc1"
+                        fi
+                fi
+                rm -f $dummy.c $dummy
+                echo powerpc-unknown-linux-gnu${LIBC}
+                exit 0
+                ;;
+          shelf_linux)
+                echo "${UNAME_MACHINE}-unknown-linux-gnu"
+                exit 0
+                ;;
+        esac
 
-        echo "${MACHINE}-${VENDOR}-linux${KERNEL}glibc${LIBC}"
-        ;;
+        if test "${UNAME_MACHINE}" = "alpha" ; then
+                cat <<EOF >$dummy.s
+                        .data
+                \$Lformat:
+                        .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+
+                        .text
+                        .globl main
+                        .align 4
+                        .ent main
+                main:
+                        .frame \$30,16,\$26,0
+                        ldgp \$29,0(\$27)
+                        .prologue 1
+                        .long 0x47e03d80 # implver \$0
+                        lda \$2,-1
+                        .long 0x47e20c21 # amask \$2,\$1
+                        lda \$16,\$Lformat
+                        mov \$0,\$17
+                        not \$1,\$18
+                        jsr \$26,printf
+                        ldgp \$29,0(\$26)
+                        mov 0,\$16
+                        jsr \$26,exit
+                        .end main
+EOF
+                LIBC=""
+                $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+                if test "$?" = 0 ; then
+                        case `./$dummy` in
+                        0-0)
+                                UNAME_MACHINE="alpha"
+                                ;;
+                        1-0)
+                                UNAME_MACHINE="alphaev5"
+                                ;;
+                        1-1)
+                                UNAME_MACHINE="alphaev56"
+                                ;;
+                        1-101)
+                                UNAME_MACHINE="alphapca56"
+                                ;;
+                        2-303)
+                                UNAME_MACHINE="alphaev6"
+                                ;;
+                        2-307)
+                                UNAME_MACHINE="alphaev67"
+                                ;;
+                        esac
+
+                        objdump --private-headers $dummy | \
+                          grep ld.so.1 > /dev/null
+                        if test "$?" = 0 ; then
+                                LIBC="libc1"
+                        fi
+                fi
+                rm -f $dummy.s $dummy
+                echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+        elif test "${UNAME_MACHINE}" = "mips" ; then
+          cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+          $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          rm -f $dummy.c $dummy
+        elif test "${UNAME_MACHINE}" = "s390"; then
+          echo s390-ibm-linux && exit 0
+        elif test "${UNAME_MACHINE}" = "x86_64"; then
+          echo x86_64-unknown-linux-gnu && exit 0
+        elif test "${UNAME_MACHINE}" = "parisc64" -o "${UNAME_MACHINE}" = "hppa64"; then
+          echo hppa64-unknown-linux-gnu && exit 0
+        elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
+          # Look for CPU level
+          case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+            PA7*)
+                echo hppa1.1-unknown-linux-gnu
+                ;;
+            PA8*)
+                echo hppa2.0-unknown-linux-gnu
+                ;;
+            *)
+                echo hppa-unknown-linux-gnu
+                ;;
+          esac
+          exit 0
+        else
+          # Either a pre-BFD a.out linker (linux-gnuoldld)
+          # or one that does not give us useful --help.
+          # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+          # If ld does not provide *any* "supported emulations:"
+          # that means it is gnuoldld.
+          test -z "$ld_supported_emulations" \
+            && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+          case "${UNAME_MACHINE}" in
+          i?86)
+            VENDOR=pc;
+            ;;
+          *)
+            VENDOR=unknown;
+            ;;
+          esac
+          # Determine whether the default compiler is a.out or elf
+          cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+        int main (int argc, char *argv[]) {
+#else
+        int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+          $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+          rm -f $dummy.c $dummy
+          test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+        fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
     i?86:DYNIX/ptx:4*:*)
         echo i386-sequent-sysv4
         exit 0 ;;
-    i?86:UnixWare:*:* )
-        echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-        exit 0 ;;
     i?86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -690,19 +1005,21 @@
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
         exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
         if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-                echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
         else
-                echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
         exit 0 ;;
     i?86:*:5:7*)
-        UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-        (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-        (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
-        (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-        (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+        else
+            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+        fi
         exit 0 ;;
     i?86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -722,7 +1039,11 @@
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
         exit 0 ;;
+    i?86:*DOS:*:*)
+        echo ${UNAME_MACHINE}-pc-msdosdjgpp
+        exit 0 ;;
     pc:*:*:*)
+        # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
         echo i386-pc-msdosdjgpp
@@ -746,7 +1067,7 @@
         exit 0 ;;
     M68*:*:R3V[567]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -769,15 +1090,15 @@
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
         exit 0 ;;
-    BS2000:POSIX-BC:*:*)
-        echo BS2000-siemens-sysv4
-        exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
         echo mips-sni-sysv4
         exit 0 ;;
@@ -808,7 +1129,7 @@
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
         exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
         exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -839,6 +1160,64 @@
     *:Rhapsody:*:*)
         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
         exit 0 ;;
+    *:Darwin:*:*)
+        echo `uname -p`-apple-darwin${UNAME_RELEASE}
+        exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+        if test "${UNAME_MACHINE}" = "x86pc"; then
+                UNAME_MACHINE=pc
+        fi
+        echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+        exit 0 ;;
+    *:QNX:*:4*)
+        echo i386-pc-qnx
+        exit 0 ;;
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
+        echo nsr-tandem-nsk${UNAME_RELEASE}
+        exit 0 ;;
+    *:NonStop-UX:*:*)
+        echo mips-compaq-nonstopux
+        exit 0 ;;
+    BS2000:POSIX*:*:*)
+        echo bs2000-siemens-sysv
+        exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+        exit 0 ;;
+    *:Plan9:*:*)
+        # "uname -m" is not consistent, so use $cputype instead. 386
+        # is converted to i386 for consistency with other x86
+        # operating systems.
+        if test "$cputype" = "386"; then
+            UNAME_MACHINE=i386
+        else
+            UNAME_MACHINE="$cputype"
+        fi
+        echo ${UNAME_MACHINE}-unknown-plan9
+        exit 0 ;;
+    i?86:OS/2:*:*)
+        # If we were able to find `uname', then EMX Unix compatibility
+        # is probably installed.
+        echo ${UNAME_MACHINE}-pc-os2-emx
+        exit 0 ;;
+    *:TOPS-10:*:*)
+        echo pdp10-unknown-tops10
+        exit 0 ;;
+    *:TENEX:*:*)
+        echo pdp10-unknown-tenex
+        exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+        echo pdp10-dec-tops20
+        exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+        echo pdp10-xkl-tops20
+        exit 0 ;;
+    *:TOPS-20:*:*)
+        echo pdp10-unknown-tops20
+        exit 0 ;;
+    *:ITS:*:*)
+        echo pdp10-unknown-its
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -930,11 +1309,24 @@
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -978,6 +1370,48 @@
     esac
 fi
 
-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/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:


ossp-pkg/sfio/etc/config.sub 1.2 -> 1.3

--- config.sub   2000/07/03 14:15:16     1.2
+++ config.sub   2001/02/12 14:50:12     1.3
@@ -1,6 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
+
+timestamp='2001-01-12'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -45,30 +51,73 @@
 #       CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # 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
+me=`echo "$0" | sed -e 's,.*/,,'`
 
-# First pass through any local machine types.
-case $1 in
-        *local*)
-                echo $1
-                exit 0
-                ;;
-        *)
-        ;;
+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 <config-patches@gnu.org>."
+
+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
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -94,7 +143,7 @@
         -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple)
+        -apple | -axis)
                 os=
                 basic_machine=$1
                 ;;
@@ -105,7 +154,7 @@
         -scout)
                 ;;
         -wrs)
-                os=vxworks
+                os=-vxworks
                 basic_machine=$1
                 ;;
         -hiux*)
@@ -156,33 +205,48 @@
         -psos*)
                 os=-psos
                 ;;
+        -mint | -mint[0-9]*)
+                basic_machine=m68k-atari
+                os=-mint
+                ;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
         # 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 \
+        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 \
-                | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
-                | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-                | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+                | 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 \
                 | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-                | thumb | d10v)
+                | thumb | d10v | d30v | fr30 | avr | openrisc)
+                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 | h8500 | w65)
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
                 ;;
 
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
-        i[34567]86)
+        i[234567]86 | x86_64)
           basic_machine=$basic_machine-pc
           ;;
         # Object if more than one company name word.
@@ -192,23 +256,28 @@
                 ;;
         # 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]* \
+        vax-* | tahoe-* | i[234567]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-* \
-              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-              | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+              | 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-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
               | clipper-* | orion-* \
-              | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+              | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
               | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
               | mips64el-* | mips64orion-* | mips64orionel-* \
               | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
               | mipstx39-* | mipstx39el-* | mcore-* \
-              | f301-* | armv*-* | t3e-* \
+              | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \
               | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-              | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+              | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+              | bs2000-* | tic54x-* | c54x-* | x86_64-*)
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -245,14 +314,14 @@
                 os=-sysv
                 ;;
         amiga | amiga-*)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 ;;
         amigaos | amigados)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 os=-amigaos
                 ;;
         amigaunix | amix)
-                basic_machine=m68k-cbm
+                basic_machine=m68k-unknown
                 os=-sysv4
                 ;;
         apollo68)
@@ -306,6 +375,9 @@
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
+                ;;
         da30 | da30-*)
                 basic_machine=m68k-da30
                 ;;
@@ -353,6 +425,10 @@
                 basic_machine=tron-gmicro
                 os=-sysv
                 ;;
+        go32)
+                basic_machine=i386-pc
+                os=-go32
+                ;;
         h3050r* | hiux*)
                 basic_machine=hppa1.1-hitachi
                 os=-hiuxwe2
@@ -426,7 +502,6 @@
                 ;;
         i370-ibm* | ibm*)
                 basic_machine=i370-ibm
-                os=-mvs
                 ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
         i[34567]86v32)
@@ -453,14 +528,6 @@
                 basic_machine=i386-unknown
                 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
                 case $os in
@@ -486,10 +553,14 @@
                 basic_machine=ns32k-utek
                 os=-sysv
                 ;;
+        mingw32)
+                basic_machine=i386-pc
+                os=-mingw32
+                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
-        *mint | *MiNT)
+        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
                 basic_machine=m68k-atari
                 os=-mint
                 ;;
@@ -507,14 +578,22 @@
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
+                ;;
         monitor)
                 basic_machine=m68k-rom68k
                 os=-coff
                 ;;
         msdos)
-                basic_machine=i386-unknown
+                basic_machine=i386-pc
                 os=-msdos
                 ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
         ncr3000)
                 basic_machine=i486-ncr
                 os=-sysv4
@@ -524,7 +603,7 @@
                 os=-netbsd
                 ;;
         netwinder)
-                basic_machine=armv4l-corel
+                basic_machine=armv4l-rebel
                 os=-linux
                 ;;
         news | news700 | news800 | news900)
@@ -572,9 +651,16 @@
                 basic_machine=i960-intel
                 os=-mon960
                 ;;
+        nonstopux)
+                basic_machine=mips-compaq
+                os=-nonstopux
+                ;;
         np1)
                 basic_machine=np1-gould
                 ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
                 os=-proelf
@@ -604,28 +690,28 @@
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pentium | p5 | k5 | k6 | nexen)
+        pentium | p5 | k5 | k6 | nexgen)
                 basic_machine=i586-pc
                 ;;
-        pentiumpro | p6 | 6x86)
+        pentiumpro | p6 | 6x86 | athlon)
                 basic_machine=i686-pc
                 ;;
         pentiumii | pentium2)
-                basic_machine=i786-pc
+                basic_machine=i686-pc
                 ;;
-        pentium-* | p5-* | k5-* | k6-* | nexen-*)
+        pentium-* | p5-* | k5-* | k6-* | nexgen-*)
                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumpro-* | p6-* | 6x86-*)
+        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pentiumii-* | pentium2-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
                 basic_machine=pn-gould
                 ;;
-        power)  basic_machine=rs6000-ibm
+        power)  basic_machine=power-ibm
                 ;;
         ppc)    basic_machine=powerpc-unknown
                 ;;
@@ -640,6 +726,10 @@
         ps2)
                 basic_machine=i386-ibm
                 ;;
+        pw32)
+                basic_machine=i586-unknown
+                os=-pw32
+                ;;
         rom68k)
                 basic_machine=m68k-rom68k
                 os=-coff
@@ -719,17 +809,22 @@
         sun386 | sun386i | roadrunner)
                 basic_machine=i386-sun
                 ;;
+        sv1)
+                basic_machine=sv1-cray
+                os=-unicos
+                ;;
         symmetry)
                 basic_machine=i386-sequent
                 os=-dynix
                 ;;
-        s390*)
-                basic_machine=s390-ibm
-                ;;
         t3e)
                 basic_machine=t3e-cray
                 os=-unicos
                 ;;
+        tic54x | c54x*)
+                basic_machine=tic54x-unknown
+                os=-coff
+                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -825,12 +920,19 @@
         vax)
                 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
                 ;;
         we32k)
                 basic_machine=we32k-att
                 ;;
+        sh3 | sh4)
+                basic_machine=sh-unknown
+                ;;
         sparc | sparcv9)
                 basic_machine=sparc-sun
                 ;;
@@ -853,8 +955,6 @@
                 basic_machine=c4x-none
                 os=-coff
                 ;;
-        BS2000-siemens)
-                ;;
         *)
                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                 exit 1
@@ -913,12 +1013,26 @@
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
               | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-              | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+              | -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[34567]86-*)
+                        ;;
+                    *)
+                        os=-nto$os
+                        ;;
+                esac
+                ;;
+        -nto*)
+                os=-nto-qnx
+                ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
               | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-              | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
         -mac*)
                 os=`echo $os | sed -e 's|mac|macos|'`
@@ -932,6 +1046,12 @@
         -sunos6*)
                 os=`echo $os | sed -e 's|sunos6|solaris3|'`
                 ;;
+        -opened*)
+                os=-openedition
+                ;;
+        -wince*)
+                os=-wince
+                ;;
         -osfrose*)
                 os=-osfrose
                 ;;
@@ -956,6 +1076,9 @@
         -ns2 )
                 os=-nextstep2
                 ;;
+        -nsk*)
+                os=-nsk
+                ;;
         # Preserve the version number of sinix5.
         -sinix5.*)
                 os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -990,7 +1113,7 @@
         -xenix)
                 os=-xenix
                 ;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                 os=-mint
                 ;;
         -none)
@@ -1018,12 +1141,15 @@
         *-acorn)
                 os=-riscix1.2
                 ;;
-        arm*-corel)
+        arm*-rebel)
                 os=-linux
                 ;;
         arm*-semi)
                 os=-aout
                 ;;
+        pdp10-*)
+                os=-tops20
+                ;;
         pdp11-*)
                 os=-none
                 ;;
@@ -1132,7 +1258,7 @@
         *-masscomp)
                 os=-rtu
                 ;;
-        f301-fujitsu)
+        f30[01]-fujitsu | f700-fujitsu)
                 os=-uxpv
                 ;;
         *-rom68k)
@@ -1192,7 +1318,7 @@
                         -genix*)
                                 vendor=ns
                                 ;;
-                        -mvs*)
+                        -mvs* | -opened*)
                                 vendor=ibm
                                 ;;
                         -ptx*)
@@ -1210,7 +1336,7 @@
                         -mpw* | -macos*)
                                 vendor=apple
                                 ;;
-                        -*mint | -*MiNT)
+                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                                 vendor=atari
                                 ;;
                 esac
@@ -1220,3 +1346,10 @@
 
 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:


ossp-pkg/sfio/etc/shtool 1.3 -> 1.4

--- shtool       2000/07/03 14:15:16     1.3
+++ shtool       2001/02/12 14:50:12     1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 ##
 ##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  See http://www.gnu.org/software/shtool/ for more information.
 ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
 ##
-##  Version:  1.5.0 (01-Jul-2000)
+##  Version:  1.5.2 (05-Oct-2000)
 ##  Contents: all available modules
 ##
 
@@ -63,8 +63,8 @@
     exit 1
 fi
 if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
-    echo "This is GNU shtool, version 1.5.0 (01-Jul-2000)"
-    echo "Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>"
+    echo "This is GNU shtool, version 1.5.2 (05-Oct-2000)"
+    echo "Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>"
     echo "Report bugs to <bug-shtool@gnu.org>"
     echo ''
     echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" 
@@ -82,7 +82,7 @@
     echo '  prop     [-p<str>]'
     echo '  move     [-v] [-t] [-e] [-p] <src-file> <dst-file>'
     echo '  install  [-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>]'
-    echo '           [-e<ext>] <file> [<file> ...] <path>'
+    echo '           [-e<sed-cmd>] <file> [<file> ...] <path>'
     echo '  mkdir    [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
     echo '  mkln     [-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>'
     echo '  mkshadow [-v] [-t] [-a] <src-dir> <dst-dir>'
@@ -101,7 +101,7 @@
     exit 0
 fi
 if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
-    echo "GNU shtool 1.5.0 (01-Jul-2000)"
+    echo "GNU shtool 1.5.2 (05-Oct-2000)"
     exit 0
 fi
 if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
@@ -182,15 +182,15 @@
         ;;
     install )
         str_tool="install"
-        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> [<file> ...] <path>"
+        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<sed-cmd>] <file> [<file> ...] <path>"
         arg_spec="2+"
-        opt_spec="v.t.c.C.s.m:o:g:e:"
+        opt_spec="v.t.c.C.s.m:o:g:e+"
         opt_v=no
         opt_t=no
         opt_c=no
         opt_C=no
         opt_s=no
-        opt_m=""
+        opt_m="0755"
         opt_o=""
         opt_g=""
         opt_e=""
@@ -455,6 +455,7 @@
     tmpfile="$tmpdir/.shtool.$$"
     rm -f $tmpfile >/dev/null 2>&1
     touch $tmpfile
+    chmod 600 $tmpfile
 fi
 
 ##
@@ -466,7 +467,7 @@
 echo )
     ##
     ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for WML as buildinfo
     ##
     
@@ -814,7 +815,7 @@
 table )
     ##
     ##  table -- Pretty-print a field-separated list as a table
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -878,7 +879,7 @@
 prop )
     ##
     ##  prop -- Display progress with a running propeller
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for mod_ssl
     ##
     
@@ -923,7 +924,7 @@
 move )
     ##
     ##  move -- Move files with simultaneous substitution
-    ##  Copyright (c) 1999-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1015,7 +1016,7 @@
 install )
     ##
     ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1045,19 +1046,13 @@
     for src in $srcs; do
         dst=$dstpath
     
-        #  If destination is a directory, append the input filename
+        #   if destination is a directory, append the input filename
         if [ $dstisdir = 1 ]; then
             dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
             dst="$dst/$dstfile"
         fi
     
-        #  Add a possible extension to src and dst
-        if [ ".$opt_e" != . ]; then
-            src="$src$opt_e"
-            dst="$dst$opt_e"
-        fi
-    
-        #  Check for correct arguments
+        #   check for correct arguments
         if [ ".$src" = ".$dst" ]; then
             echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2
             continue
@@ -1067,18 +1062,18 @@
             continue
         fi
     
-        #  Make a temp file name in the destination directory
+        #   make a temp file name in the destination directory
         dsttmp=`echo $dst |\
                 sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \
                     -e "s;\$;/#INST@$$#;"`
     
-        #  Verbosity
+        #   verbosity
         if [ ".$opt_v" = .yes ]; then
             echo "$src -> $dst" 1>&2
         fi
     
-        #  Copy or move the file name to the temp name
-        #  (because we might be not allowed to change the source)
+        #   copy or move the file name to the temp name
+        #   (because we might be not allowed to change the source)
         if [ ".$opt_C" = .yes ]; then
             opt_c=yes
         fi
@@ -1094,8 +1089,16 @@
             mv $src $dsttmp || exit $?
         fi
     
-        #  Adjust the target file
-        #  (we do chmod last to preserve setuid bits)
+        #   adjust the target file
+        if [ ".$opt_e" != . ]; then
+            sed='sed'
+            for e in $opt_e; do
+                sed="$sed -e '$e'"
+            done
+            cp $dsttmp $dsttmp.old
+            eval "$sed <$dsttmp.old >$dsttmp" || exit $?
+            rm -f $dsttmp.old
+        fi
         if [ ".$opt_s" = .yes ]; then
             if [ ".$opt_t" = .yes ]; then
                 echo "strip $dsttmp" 1>&2
@@ -1114,14 +1117,14 @@
             fi
             chgrp $opt_g $dsttmp || exit $?
         fi
-        if [ ".$opt_m" != . ]; then
+        if [ ".$opt_m" != ".-" ]; then
             if [ ".$opt_t" = .yes ]; then
                 echo "chmod $opt_m $dsttmp" 1>&2
             fi
             chmod $opt_m $dsttmp || exit $?
         fi
     
-        #   Determine whether to do a quick install
+        #   determine whether to do a quick install
         #   (has to be done _after_ the strip was already done)
         quick=no
         if [ ".$opt_C" = .yes ]; then
@@ -1132,7 +1135,7 @@
             fi
         fi
     
-        #   Finally install the file to the real destination
+        #   finally, install the file to the real destination
         if [ $quick = yes ]; then
             if [ ".$opt_t" = .yes ]; then
                 echo "rm -f $dsttmp" 1>&2
@@ -1150,7 +1153,7 @@
 mkdir )
     ##
     ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
     ##  Cleaned up and enhanced for shtool
     ##
@@ -1159,7 +1162,7 @@
     for p in ${1+"$@"}; do
         #   if the directory already exists...
         if [ -d "$p" ]; then
-            if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then
+            if [ ".$opt_f" = .no -a ".$opt_p" = .no ]; then
                 echo "$msgprefix:Error: directory already exists: $p" 1>&2
                 errstatus=1
                 break
@@ -1209,7 +1212,7 @@
 mkln )
     ##
     ##  mkln -- Make link with calculation of relative paths
-    ##  Copyright (c) 1999-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1287,12 +1290,12 @@
     
         #   split away a common prefix
         prefix=""
-        if [ ".$srcdir" = ".$dstdir" ] && [ ".$srcdir" != . ]; then
+        if [ ".$srcdir" = ".$dstdir" -a ".$srcdir" != . ]; then
             prefix="$srcdir/"
             srcdir=""
             dstdir=""
         else
-            while [ ".$srcdir" != . ] && [ ".$dstdir" != . ]; do
+            while [ ".$srcdir" != . -a ".$dstdir" != . ]; do
                 presrc=`echo $srcdir | sed -e 's;^\([^/]*\)/.*;\1;'`
                 predst=`echo $dstdir | sed -e 's;^\([^/]*\)/.*;\1;'`
                 if [ ".$presrc" != ".$predst" ]; then
@@ -1348,7 +1351,7 @@
 mkshadow )
     ##
     ##  mkshadow -- Make a shadow tree through symbolic links
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -1465,7 +1468,7 @@
 fixperm )
     ##
     ##  fixperm -- Fix file permissions inside a source tree
-    ##  Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for ePerl
     ##
     
@@ -1521,7 +1524,7 @@
 tarball )
     ##
     ##  tarball -- Roll distribution tarballs
-    ##  Copyright (c) 1999-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1547,7 +1550,7 @@
         for tool in `echo $tools | sed -e 's/,/ /g'`; do
             #   iterate over paths
             for path in $paths; do
-                if [ $minusx "$path/$tool" ] && [ ! -d "$path/$tool" ]; then
+                if [ $minusx "$path/$tool" -a ! -d "$path/$tool" ]; then
                     eval "prg_${prg}=\"$path/$tool\""
                     break
                 fi
@@ -1573,7 +1576,7 @@
             if [ ".$opt_t" = .yes ]; then
                 echo "(cd $src && $prg_find . -type f -depth -print) | sed -e 's:^\\.\$::' -e 's:^\\./::' | cat $exclude >>$tmpfile.lst" 1>&2
             fi
-            (cd $src && find . -type f -depth -print) |\
+            (cd $src && $prg_find . -type f -depth -print) |\
             sed -e 's:^\.$::' -e 's:^\./::' | eval cat $exclude >>$tmpfile.lst
         else
             if [ ".$opt_t" = .yes ]; then
@@ -1747,6 +1750,7 @@
             ;;
         HP-UX:*)
             HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+            MACHINE=`echo ${MACHINE}|sed -e 's:/:_:'`
             echo "${MACHINE}-hp-hpux${HPUXVER}"; exit 0
             ;;
         IRIX:*)
@@ -1930,7 +1934,7 @@
 arx )
     ##
     ##  arx -- Extended archive command
-    ##  Copyright (c) 1999-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -2008,7 +2012,7 @@
 slo )
     ##
     ##  slo -- Separate linker options by library class
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -2164,7 +2168,7 @@
 scpp )
     ##
     ##  scpp -- Sharing C Pre-Processor
-    ##  Copyright (c) 1999-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for GNU Pth
     ##
     
@@ -2377,7 +2381,7 @@
 version )
     ##
     ##  version -- Maintain a version information file
-    ##  Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1994-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for ePerl, rewritten from scratch for shtool
     ##
     
@@ -2461,7 +2465,8 @@
         s     ) typnum=15; levnum=255  ;; # snapshots are special
     esac
     hex=`echo "$ver:$rev:$typnum:$levnum" |\
-         awk -F: '{ printf("0x%X%02X%1X%02X", $1, $2, $3, $4); }'`
+         awk -F: '{ printf("0x%x%02x%1x%02x", $1, $2, $3, $4); }' |\
+         tr 'abcdef' 'ABCDEF'`
     ltv=`echo "$ver:$rev:$typnum:$levnum" |\
          awk -F: '{ printf("%d:%d", $1*10 + $2, $3*10 + $4); }'`
     
@@ -2534,7 +2539,7 @@
         vGNU="${name} ${triple} (${tim})"
         vWeb="${name}/${triple}"
         vSCCS="@(#)${name} ${triple} (${tim})"
-        vRCS="\$Id: shtool,v 1.3 2000/07/03 14:15:16 rse Exp ${name} ${triple} (${tim}) \$"
+        vRCS="\$Id: shtool,v 1.4 2001/02/12 14:50:12 rse Exp ${name} ${triple} (${tim}) \$"
     
         #   determine string out of filename
         #   (do NOT try to optimize this in any way because of portability)
@@ -2627,6 +2632,23 @@
                 echo >>$file "1;"
                 echo >>$file ""
                 ;;
+            python )
+                echo >>$file "##"
+                echo >>$file "##  ${file} -- Version Information for ${name} (syntax: Python)"
+                echo >>$file "##  [automatically generated and maintained by GNU shtool]"
+                echo >>$file "##"
+                echo >>$file ""
+                echo >>$file "class ${prefix}version:"
+                echo >>$file "    v_hex       = ${vHex}"
+                echo >>$file "    v_short     = \"${vShort}\""
+                echo >>$file "    v_long      = \"${vLong}\""
+                echo >>$file "    v_tex       = \"${vTeX}\""
+                echo >>$file "    v_gnu       = \"${vGNU}\""
+                echo >>$file "    v_web       = \"${vWeb}\""
+                echo >>$file "    v_sccs      = \"${vSCCS}\""
+                echo >>$file "    v_rcs       = \"${vRCS}\""
+                echo >>$file ""
+                ;;
             * ) echo "$msgprefix:Error: invalid argument to option \`-l': \`$opt_l'" 1>&2
                 exit 1
                 ;;
@@ -2637,7 +2659,7 @@
 path )
     ##
     ##  path -- Deal with program paths
-    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -2687,7 +2709,7 @@
     
     #   MAGIC SITUATION
     #   Perl Interpreter (perl)
-    if [ ".$opt_m" = .yes ] && [ ".$namelist" = .perl ]; then
+    if [ ".$opt_m" = .yes  -a ".$namelist" = .perl ]; then
         rm -f $tmpfile
         touch $tmpfile
         found=0
@@ -2696,7 +2718,7 @@
             dir=`echo $dir | sed -e 's;/*$;;'`
             nc=99
             for name in perl perl5 miniperl; do
-                 if [ $minusx "$dir/$name" ] && [ ! -d "$dir/$name" ]; then
+                 if [ $minusx "$dir/$name" -a ! -d "$dir/$name" ]; then
                      perl="$dir/$name"
                      pv=`$perl -e 'printf("%.3f", $]);'`
                      echo "$pv:$pc:$nc:$perl" >>$tmpfile
@@ -2717,7 +2739,7 @@
     
     #   MAGIC SITUATION
     #   C pre-processor (cpp)
-    if [ ".$opt_m" = .yes ] && [ ".$namelist" = .cpp ]; then
+    if [ ".$opt_m" = .yes -a ".$namelist" = .cpp ]; then
         echo >$tmpfile.c "#include <assert.h>"
         echo >>$tmpfile.c "Syntax Error"
         #   1. try the standard cc -E approach
@@ -2733,7 +2755,7 @@
                 #   3. try a standalone cpp command in path and lib dirs
                 for path in $paths /lib /usr/lib /usr/local/lib; do
                     path=`echo $path | sed -e 's;/*$;;'`
-                    if [ $minusx "$path/cpp" ] && [ ! -d "$path/cpp" ]; then
+                    if [ $minusx "$path/cpp" -a ! -d "$path/cpp" ]; then
                         cpp="$path/cpp"
                         break
                     fi
@@ -2762,7 +2784,7 @@
         #   iterate over paths
         for path in $paths; do
             path=`echo $path | sed -e 's;/*$;;'`
-            if [ $minusx "$path/$name" ] && [ ! -d "$path/$name" ]; then
+            if [ $minusx "$path/$name" -a ! -d "$path/$name" ]; then
                 if [ ".$opt_s" != .yes ]; then
                     echo "$path/$name"
                 fi

CVSTrac 2.0.1