httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/shmem/unix/mm CHANGES Makefile.in aclocal.m4 config.guess config.sub configure configure.in fbtool ltconfig ltmain.sh mm-config.1 mm-config.in mm.3 mm.h mm.pod mm_alloc.c mm_core.c mm_test.c mm_vers.c shtool
Date Mon, 27 Sep 1999 07:42:29 GMT
rse         99/09/27 00:42:27

  Modified:    src/lib/apr/shmem/unix/mm CHANGES Makefile.in aclocal.m4
                        config.guess config.sub configure configure.in
                        fbtool ltconfig ltmain.sh mm-config.1 mm-config.in
                        mm.3 mm.h mm.pod mm_alloc.c mm_core.c mm_test.c
                        mm_vers.c shtool
  Log:
  Update the MM version APR contains to a more recent one.
  
  Revision  Changes    Path
  1.2       +30 -0     apache-2.0/src/lib/apr/shmem/unix/mm/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/CHANGES,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CHANGES	1999/08/17 15:59:44	1.1
  +++ CHANGES	1999/09/27 07:41:58	1.2
  @@ -2,6 +2,36 @@
    MM CHANGES
    ==========
   
  + Changes between 1.0.10 and 1.0.11 (27-Aug-1999 to 06-Sep-1999)
  +
  +  *) Cleaned up various file permission in source tree
  +  *) Enhanced mm-config.in: new --all option and less newlines
  +  *) Added support --silent to libtool glue code in aclocal.m4
  +  *) Upgraded to GNU Pth's more recent config.{guess,sub}
  +  *) Upgraded to GNU shtool 1.4.6
  +  *) Fixed --section for mm-config in Makefile.in
  +  *) Added `void *' casts to MAP_FAILED (= -1) values to avoid
  +     warnings under some platforms.
  +  *) Fixed a few typos in mm.pod
  +
  + Changes between 1.0.9 and 1.0.10 (02-Jul-1999 to 27-Aug-1999)
  +
  +  *) Changed "make dist" and "make snap" to use "shtool tarball"
  +  *) Added #define KERNEL for SunOS to get SHM_R und SHM_W values.
  +  *) Upgraded to GNU libtool 1.3.3
  +  *) Upgraded to GNU shtool 1.4.5
  +  *) Downgraded required Autoconf version to 2.12
  +  *) Added MM version number to test report
  +  *) Added --enable-batch
  +  *) Moved mm_lock_mode in mm.h to top to avoid warnings
  +
  + Changes between 1.0.8 and 1.0.9 (24-Jun-1999 to 02-Jul-1999)
  +
  +  *) Fixed a nasty bug related to {MM,mm}_[un]lock():
  +     an additional semicolon broke the semantics.
  +  *) Upgraded to released shtool 1.4.0
  +  *) Fixed `make test'
  +
    Changes between 1.0.7 and 1.0.8 (22-Jun-1999 to 24-Jun-1999)
     
     *) Added important MAP_FAILED fallback also to Autoconf stuff
  
  
  
  1.2       +19 -22    apache-2.0/src/lib/apr/shmem/unix/mm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	1999/08/17 15:59:44	1.1
  +++ Makefile.in	1999/09/27 07:41:59	1.2
  @@ -88,16 +88,17 @@
   mm_alloc.c mm_core.c mm_global.c: mm_conf.h mm.h mm_vers.c
   
   test: mm_test
  -	@./mm_test; \
  +	-@./mm_test; \
   	if [ $$? -eq 0 ]; then \
  -		PLATFORM=`./config.guess`; PLATFORM=`./config.sub $$PLATFORM`; \
  +		PLATFORM=`$(SHELL) ./config.guess`; \
  +		PLATFORM=`$(SHELL) ./config.sub $$PLATFORM`; \
   		if [ ".`grep $$PLATFORM README`" = . ]; then \
   	        echo "Please send the following summary via Email to the author"; \
   	        echo "Ralf S. Engelschall <rse@engelschall.com> for inclusion into"; \
   	        echo "the list of successfully tested platforms (see README file):"; \
   	        echo ""; \
   	        echo "Ok" >.fbtool; \
  -	        ./fbtool -d; \
  +	        $(SHELL) ./fbtool -d; \
   	    fi; \
   	else \
   	    echo "Please send the following summary together with as much other"; \
  @@ -106,8 +107,9 @@
   	    echo "down your platform problem."; \
   	    echo ""; \
   	    echo "Failed" >.fbtool; \
  -	    ./fbtool -d; \
  -	fi
  +	    $(SHELL) ./fbtool -d; \
  +	fi; \
  +	exit 0
   
   debug: mm_test
   	@$(LIBTOOL) --mode=execute gdb mm_test
  @@ -127,13 +129,13 @@
   	V1=`$(SHTOOL) version -l c -d short $(_VERSION_FILE)`; \
   	V2=`$(SHTOOL) version -l c -d long $(_VERSION_FILE)`; \
   	D=`$(SHTOOL) version -l c -d long $(_VERSION_FILE) | sed -e 's;.*(;;' -e 's;).*;;'`; \
  -	pod2man --section=3 --center="Shared Memory Library" --release="$$D" --date="MM $$V1" mm-config.pod |\
  +	pod2man --section=1 --center="Shared Memory Library" --release="$$D" --date="MM $$V1" mm-config.pod |\
   	perl -p -e 's;^(\\\&\s+.+?)([Mm][Mm]_[a-zA-Z0-9_]+)(\(.+?)$$;$$1\\fB$$2\\fR$$3;' |\
   	sed -e "s;MM_VERSION_STR;$$V2;" >mm-config.1
   
   update:
  -	@$(RM) ltmain.sh ltconfig
  -	@$(MAKE) $(MFLAGS) ltmain.sh ltconfig configure
  +	@$(RM) ltmain.sh ltconfig shtool
  +	@$(MAKE) $(MFLAGS) ltmain.sh ltconfig configure shtool
   
   configure: configure.in aclocal.m4
   	$(RM) configure
  @@ -150,6 +152,9 @@
   	@F=`libtoolize -n -c -f | grep 'cp.*ltconfig' | sed -e 's;[^/]*;;' -e 's; .*;;'`; \
   	echo "ltconfig <-- $$F"; cp $$F .
   
  +shtool:
  +	shtoolize -o shtool all
  +
   install: all
   	$(SHTOOL) mkdir -f -p -m 755 $(bindir)
   	$(SHTOOL) mkdir -f -p -m 755 $(includedir)
  @@ -183,24 +188,16 @@
   dist: distclean
   	@$(SHTOOL) fixperm -v *; \
   	V=`$(SHTOOL) version -l c -d short $(_VERSION_FILE)`; \
  -	gtar --no-recursion -cvf - `find * -depth -print | sort | grep -v CVS | grep -v .cvsignore ` |\
  -    tardy --user_number=0  --user_name=rse \
  -          --group_number=0 --group_name=en \
  -          --prefix=mm-$$V - |\
  -    gzip --best >/tmp/mm-$$V.tar.gz && \
  -	cp /tmp/mm-$$V.tar.gz .; rm -f /tmp/mm-$$V.tar.gz; \
  -	ls -l mm-$$V.tar.gz
  +	$(SHTOOL) tarball -o mm-$${V}.tar.gz -d mm-$${V} -u rse -g mm \
  +	                  -e 'CVS,\.cvsignore,\.[ao],^\.' -c 'gzip --best' .; \
  +	ls -l mm-$${V}.tar.gz
   
   snap: distclean
   	@$(SHTOOL) fixperm *; \
   	V=`$(SHTOOL) version -l c -d short $(_VERSION_FILE)`; \
  -	gtar --no-recursion -cvf - `find * -depth -print | sort | grep -v CVS | grep -v .cvsignore ` |\
  -    tardy --user_number=0  --user_name=rse \
  -          --group_number=0 --group_name=en \
  -          --prefix=mm-$$V - |\
  -    gzip --best >/tmp/mm-$$V-SNAP.tar.gz && \
  -	cp /tmp/mm-$$V-SNAP.tar.gz .; rm -f /tmp/mm-$$V-SNAP.tar.gz; \
  -	ls -l mm-$$V-SNAP.tar.gz
  +	$(SHTOOL) tarball -o mm-$${V}-SNAP.tar.gz -d mm-$${V}-SNAP -u rse -g mm \
  +	                  -e 'CVS,\.cvsignore,\.[ao],^\.' -c 'gzip --best' .; \
  +	ls -l mm-$${V}-SNAP.tar.gz
   
   new-version:
   	OPT='-i v' && $(_VERSION)
  
  
  
  1.2       +6 -5      apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aclocal.m4	1999/08/17 15:59:44	1.1
  +++ aclocal.m4	1999/09/27 07:42:00	1.2
  @@ -13,10 +13,11 @@
   enable_shared=yes
   )dnl
   libtool_flags=''
  -test "$enable_static"     = no  && libtool_flags="$libtool_flags --disable-static"
  -test "$enable_shared"     = no  && libtool_flags="$libtool_flags --disable-shared"
  -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"
  +test ".$silent"            = .yes && libtool_flags="$libtool_flags --silent"
  +test ".$enable_static"     = .no  && libtool_flags="$libtool_flags --disable-static"
  +test ".$enable_shared"     = .no  && libtool_flags="$libtool_flags --disable-shared"
  +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"
   CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" \
   ${CONFIG_SHELL-/bin/sh} ltconfig --no-reexec \
   $libtool_flags --no-verify ltmain.sh $PLATFORM ||\
  @@ -30,7 +31,7 @@
   define(AC_CHECK_DEBUGGING,[dnl
   AC_MSG_CHECKING(for compilation debug mode)
   AC_ARG_ENABLE(debug,dnl
  -[  --enable-debug          build for debugging],
  +[  --enable-debug          build for debugging (default=no)],
   [dnl
   if test ".$ac_cv_prog_gcc" = ".yes"; then
       case "$CFLAGS" in
  
  
  
  1.2       +22 -1     apache-2.0/src/lib/apr/shmem/unix/mm/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/config.guess,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.guess	1999/08/17 15:59:44	1.1
  +++ config.guess	1999/09/27 07:42:01	1.2
  @@ -579,7 +579,22 @@
   	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   	exit 0 ;;
       *:FreeBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  +	# echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  +        VERS=`echo ${UNAME_RELEASE} | sed -e 's/[-(].*//'`
  +        MACH=`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/[-_].*/\./'`
  @@ -783,6 +798,9 @@
       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...
  @@ -876,6 +894,9 @@
   	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
  
  
  
  1.2       +3 -0      apache-2.0/src/lib/apr/shmem/unix/mm/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/config.sub,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.sub	1999/08/17 15:59:44	1.1
  +++ config.sub	1999/09/27 07:42:02	1.2
  @@ -850,6 +850,8 @@
   		basic_machine=c4x-none
   		os=-coff
   		;;
  +	BS2000-siemens)
  +		;;
   	*)
   		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   		exit 1
  @@ -1214,3 +1216,4 @@
   esac
   
   echo $basic_machine$os
  +exit 0
  
  
  
  1.2       +111 -92   apache-2.0/src/lib/apr/shmem/unix/mm/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure	1999/08/17 15:59:44	1.1
  +++ configure	1999/09/27 07:42:03	1.2
  @@ -1,18 +1,17 @@
   #! /bin/sh
   
  -# From configure.in Revision: 1.4 
  -
  +# From configure.in 1.0
   SHTOOL="\$(TOP)/shtool"
   
   ac_shtool="./shtool"
   T_MD=`$ac_shtool echo -n -e %B`
   T_ME=`$ac_shtool echo -n -e %b`
  -PLATFORM=`./config.guess`
  -PLATFORM=`./config.sub $PLATFORM`
  +PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.guess`
  +PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.sub $PLATFORM`
   MM_VERSION_STR="`$ac_shtool version -l c -d long mm_vers.c`"
   
   
  -echo "${T_MD}Configuring MM library, Version ${MM_VERSION_STR}${T_ME}"
  +echo "Configuring ${T_MD}MM${T_ME} (Shared Memory Library), Version ${T_MD}${MM_VERSION_STR}${T_ME}"
   echo "Copyright (c) 1999 Ralf S. Engelschall, All Rights Reserved."
   echo "Platform: ${T_MD}${PLATFORM}${T_ME}"
   
  @@ -32,8 +31,10 @@
   ac_default_prefix=/usr/local
   # Any additions from configure.in:
   ac_default_prefix=/usr/local
  +ac_help="$ac_help
  +  --enable-batch          build in batch mode (default=no)"
   ac_help="$ac_help
  -  --enable-debug          build for debugging"
  +  --enable-debug          build for debugging (default=no)"
   ac_help="$ac_help
     --enable-static         build static libraries (default=yes)"
   ac_help="$ac_help
  @@ -554,14 +555,25 @@
   
   
   
  +# Check whether --enable-batch or --disable-batch was given.
  +if test "${enable_batch+set}" = set; then
  +  enableval="$enable_batch"
  +  enable_batch="$enableval"
  +else
  +  if test ".$enable_batch" = .; then
  +    enable_batch=no
  +fi
   
  +fi
  +
  +
   echo "$ac_t""" 1>&6
   echo "$ac_t""${T_MD}Build Tools:${T_ME}" 1>&6
   
   # Extract the first word of "gcc", so it can be a program name with args.
   set dummy gcc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:565: checking for $ac_word" >&5
  +echo "configure:577: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -591,7 +603,7 @@
     # Extract the first word of "cc", so it can be a program name with args.
   set dummy cc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:595: checking for $ac_word" >&5
  +echo "configure:607: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -642,7 +654,7 @@
         # Extract the first word of "cl", so it can be a program name with args.
   set dummy cl; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  -echo "configure:646: checking for $ac_word" >&5
  +echo "configure:658: checking for $ac_word" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -674,7 +686,7 @@
   fi
   
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  -echo "configure:678: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  +echo "configure:690: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
   
   ac_ext=c
   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  @@ -685,12 +697,12 @@
   
   cat > conftest.$ac_ext << EOF
   
  -#line 689 "configure"
  +#line 701 "configure"
   #include "confdefs.h"
   
   main(){return(0);}
   EOF
  -if { (eval echo configure:694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     ac_cv_prog_cc_works=yes
     # If we can't run a trivial program, we are probably using a cross compiler.
     if (./conftest; exit) 2>/dev/null; then
  @@ -716,12 +728,12 @@
     { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   fi
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  -echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  +echo "configure:732: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   cross_compiling=$ac_cv_prog_cc_cross
   
   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
  -echo "configure:725: checking whether we are using GNU C" >&5
  +echo "configure:737: checking whether we are using GNU C" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -730,7 +742,7 @@
     yes;
   #endif
   EOF
  -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     ac_cv_prog_gcc=yes
   else
     ac_cv_prog_gcc=no
  @@ -749,7 +761,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
  -echo "configure:753: checking whether ${CC-cc} accepts -g" >&5
  +echo "configure:765: checking whether ${CC-cc} accepts -g" >&5
   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -781,7 +793,7 @@
   fi
   
   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
  -echo "configure:785: checking how to run the C preprocessor" >&5
  +echo "configure:797: checking how to run the C preprocessor" >&5
   # On Suns, sometimes $CPP names a directory.
   if test -n "$CPP" && test -d "$CPP"; then
     CPP=
  @@ -796,13 +808,13 @@
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp.
     cat > conftest.$ac_ext <<EOF
  -#line 800 "configure"
  +#line 812 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -813,13 +825,13 @@
     rm -rf conftest*
     CPP="${CC-cc} -E -traditional-cpp"
     cat > conftest.$ac_ext <<EOF
  -#line 817 "configure"
  +#line 829 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -830,13 +842,13 @@
     rm -rf conftest*
     CPP="${CC-cc} -nologo -E"
     cat > conftest.$ac_ext <<EOF
  -#line 834 "configure"
  +#line 846 "configure"
   #include "confdefs.h"
   #include <assert.h>
   Syntax Error
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     :
  @@ -861,7 +873,7 @@
   echo "$ac_t""$CPP" 1>&6
   
   echo $ac_n "checking for compilation debug mode""... $ac_c" 1>&6
  -echo "configure:865: checking for compilation debug mode" >&5
  +echo "configure:877: checking for compilation debug mode" >&5
   # Check whether --enable-debug or --disable-debug was given.
   if test "${enable_debug+set}" = set; then
     enableval="$enable_debug"
  @@ -901,7 +913,7 @@
   echo "$ac_t""$msg" 1>&6
   
   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  -echo "configure:905: checking whether ${MAKE-make} sets \${MAKE}" >&5
  +echo "configure:917: checking whether ${MAKE-make} sets \${MAKE}" >&5
   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -944,10 +956,11 @@
   
   fi
   libtool_flags=''
  -test "$enable_static"     = no  && libtool_flags="$libtool_flags --disable-static"
  -test "$enable_shared"     = no  && libtool_flags="$libtool_flags --disable-shared"
  -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"
  +test ".$silent"            = .yes && libtool_flags="$libtool_flags --silent"
  +test ".$enable_static"     = .no  && libtool_flags="$libtool_flags --disable-static"
  +test ".$enable_shared"     = .no  && libtool_flags="$libtool_flags --disable-shared"
  +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"
   CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" \
   ${CONFIG_SHELL-/bin/sh} ltconfig --no-reexec \
   $libtool_flags --no-verify ltmain.sh $PLATFORM ||\
  @@ -969,17 +982,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:973: checking for $ac_hdr" >&5
  +echo "configure:986: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 978 "configure"
  +#line 991 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1059,17 +1072,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1063: checking for $ac_hdr" >&5
  +echo "configure:1076: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1068 "configure"
  +#line 1081 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1098,12 +1111,12 @@
   for ac_func in memcpy memset bcopy
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1102: checking for $ac_func" >&5
  +echo "configure:1115: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1107 "configure"
  +#line 1120 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1127,7 +1140,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1152,12 +1165,12 @@
   done
   
   echo $ac_n "checking for _POSIX_PATH_MAX in limits.h""... $ac_c" 1>&6
  -echo "configure:1156: checking for _POSIX_PATH_MAX in limits.h" >&5
  +echo "configure:1169: checking for _POSIX_PATH_MAX in limits.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define__POSIX_PATH_MAX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1161 "configure"
  +#line 1174 "configure"
   #include "confdefs.h"
   
   #include <limits.h>
  @@ -1184,12 +1197,12 @@
   
   echo "$ac_t""$ac_cv_define__POSIX_PATH_MAX" 1>&6
   echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6
  -echo "configure:1188: checking for PATH_MAX in limits.h" >&5
  +echo "configure:1201: checking for PATH_MAX in limits.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_PATH_MAX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1193 "configure"
  +#line 1206 "configure"
   #include "confdefs.h"
   
   #include <limits.h>
  @@ -1216,12 +1229,12 @@
   
   echo "$ac_t""$ac_cv_define_PATH_MAX" 1>&6
   echo $ac_n "checking for MAXPATHLEN in sys/param.h""... $ac_c" 1>&6
  -echo "configure:1220: checking for MAXPATHLEN in sys/param.h" >&5
  +echo "configure:1233: checking for MAXPATHLEN in sys/param.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_MAXPATHLEN'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1225 "configure"
  +#line 1238 "configure"
   #include "confdefs.h"
   
   #include <sys/param.h>
  @@ -1248,12 +1261,12 @@
   
   echo "$ac_t""$ac_cv_define_MAXPATHLEN" 1>&6
   echo $ac_n "checking for _POSIX_CHILD_MAX in limits.h""... $ac_c" 1>&6
  -echo "configure:1252: checking for _POSIX_CHILD_MAX in limits.h" >&5
  +echo "configure:1265: checking for _POSIX_CHILD_MAX in limits.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define__POSIX_CHILD_MAX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1257 "configure"
  +#line 1270 "configure"
   #include "confdefs.h"
   
   #include <limits.h>
  @@ -1280,12 +1293,12 @@
   
   echo "$ac_t""$ac_cv_define__POSIX_CHILD_MAX" 1>&6
   echo $ac_n "checking for CHILD_MAX in limits.h""... $ac_c" 1>&6
  -echo "configure:1284: checking for CHILD_MAX in limits.h" >&5
  +echo "configure:1297: checking for CHILD_MAX in limits.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_CHILD_MAX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1289 "configure"
  +#line 1302 "configure"
   #include "confdefs.h"
   
   #include <limits.h>
  @@ -1328,17 +1341,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1332: checking for $ac_hdr" >&5
  +echo "configure:1345: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1337 "configure"
  +#line 1350 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1367,12 +1380,12 @@
   for ac_func in getpagesize sysconf
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1371: checking for $ac_func" >&5
  +echo "configure:1384: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1376 "configure"
  +#line 1389 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1396,7 +1409,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1421,12 +1434,12 @@
   done
   
   echo $ac_n "checking for _SC_PAGESIZE in unistd.h""... $ac_c" 1>&6
  -echo "configure:1425: checking for _SC_PAGESIZE in unistd.h" >&5
  +echo "configure:1438: checking for _SC_PAGESIZE in unistd.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define__SC_PAGESIZE'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1430 "configure"
  +#line 1443 "configure"
   #include "confdefs.h"
   
   #include <unistd.h>
  @@ -1551,17 +1564,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1555: checking for $ac_hdr" >&5
  +echo "configure:1568: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1560 "configure"
  +#line 1573 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1588,12 +1601,12 @@
   done
   
   echo $ac_n "checking for MAP_ANON in sys/mman.h""... $ac_c" 1>&6
  -echo "configure:1592: checking for MAP_ANON in sys/mman.h" >&5
  +echo "configure:1605: checking for MAP_ANON in sys/mman.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_MAP_ANON'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1597 "configure"
  +#line 1610 "configure"
   #include "confdefs.h"
   
   #include <sys/mman.h>
  @@ -1622,12 +1635,12 @@
   for ac_func in mmap munmap shm_open shm_unlink
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1626: checking for $ac_func" >&5
  +echo "configure:1639: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1631 "configure"
  +#line 1644 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1651,7 +1664,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1678,7 +1691,7 @@
   
   ac_safe=`echo "/dev/zero" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for /dev/zero""... $ac_c" 1>&6
  -echo "configure:1682: checking for /dev/zero" >&5
  +echo "configure:1695: checking for /dev/zero" >&5
   if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -1702,17 +1715,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1706: checking for $ac_hdr" >&5
  +echo "configure:1719: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1711 "configure"
  +#line 1724 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1741,12 +1754,12 @@
   for ac_func in shmget shmat shmdt shmctl
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1745: checking for $ac_func" >&5
  +echo "configure:1758: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1750 "configure"
  +#line 1763 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1770,7 +1783,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -2012,7 +2025,7 @@
   
   
   echo $ac_n "checking for shared memory maximum segment size""... $ac_c" 1>&6
  -echo "configure:2016: checking for shared memory maximum segment size" >&5
  +echo "configure:2029: checking for shared memory maximum segment size" >&5
   OCFLAGS="$CFLAGS"
   case "$ac_decision" in
       MM_SHMT_MM*    ) CFLAGS="-DTEST_MMAP   $CFLAGS" ;;
  @@ -2025,7 +2038,7 @@
   
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2029 "configure"
  +#line 2042 "configure"
   #include "confdefs.h"
   
   #include <stdio.h>
  @@ -2130,7 +2143,7 @@
   
   
   EOF
  -if { (eval echo configure:2134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     
   MM_SHM_MAXSEGSIZE="`cat conftestval`"
  @@ -2177,17 +2190,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2181: checking for $ac_hdr" >&5
  +echo "configure:2194: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2186 "configure"
  +#line 2199 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -2216,12 +2229,12 @@
   for ac_func in semget semctl
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:2220: checking for $ac_func" >&5
  +echo "configure:2233: checking for $ac_func" >&5
   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2225 "configure"
  +#line 2238 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -2245,7 +2258,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -2270,12 +2283,12 @@
   done
   
   echo $ac_n "checking for LOCK_EX in sys/file.h""... $ac_c" 1>&6
  -echo "configure:2274: checking for LOCK_EX in sys/file.h" >&5
  +echo "configure:2287: checking for LOCK_EX in sys/file.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_LOCK_EX'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2279 "configure"
  +#line 2292 "configure"
   #include "confdefs.h"
   
   #include <sys/file.h>
  @@ -2302,12 +2315,12 @@
   
   echo "$ac_t""$ac_cv_define_LOCK_EX" 1>&6
   echo $ac_n "checking for F_SETLK in fcntl.h""... $ac_c" 1>&6
  -echo "configure:2306: checking for F_SETLK in fcntl.h" >&5
  +echo "configure:2319: checking for F_SETLK in fcntl.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_F_SETLK'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2311 "configure"
  +#line 2324 "configure"
   #include "confdefs.h"
   
   #include <fcntl.h>
  @@ -2334,12 +2347,12 @@
   
   echo "$ac_t""$ac_cv_define_F_SETLK" 1>&6
   echo $ac_n "checking for IPC_PRIVATE in sys/ipc.h""... $ac_c" 1>&6
  -echo "configure:2338: checking for IPC_PRIVATE in sys/ipc.h" >&5
  +echo "configure:2351: checking for IPC_PRIVATE in sys/ipc.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_IPC_PRIVATE'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2343 "configure"
  +#line 2356 "configure"
   #include "confdefs.h"
   
   #include <sys/ipc.h>
  @@ -2366,12 +2379,12 @@
   
   echo "$ac_t""$ac_cv_define_IPC_PRIVATE" 1>&6
   echo $ac_n "checking for SEM_UNDO in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:2370: checking for SEM_UNDO in sys/sem.h" >&5
  +echo "configure:2383: checking for SEM_UNDO in sys/sem.h" >&5
   if eval "test \"`echo '$''{'ac_cv_define_SEM_UNDO'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2375 "configure"
  +#line 2388 "configure"
   #include "confdefs.h"
   
   #include <sys/sem.h>
  @@ -2399,9 +2412,9 @@
   echo "$ac_t""$ac_cv_define_SEM_UNDO" 1>&6
   
   echo $ac_n "checking whether union semun is defined in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:2403: checking whether union semun is defined in sys/sem.h" >&5
  +echo "configure:2416: checking whether union semun is defined in sys/sem.h" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 2405 "configure"
  +#line 2418 "configure"
   #include "confdefs.h"
   
   #include <sys/types.h>
  @@ -2415,7 +2428,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:2419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  +if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     rm -rf conftest*
     cat >> confdefs.h <<\EOF
   #define HAVE_UNION_SEMUN 1
  @@ -2431,7 +2444,7 @@
   rm -f conftest*
   echo "$ac_t""$msg" 1>&6
   
  -ac_decision_item='mutual exclusion implementation method'
  +ac_decision_item='mutex implementation method'
   ac_decision_msg='FAILED'
   ac_decision=''
   
  @@ -2920,4 +2933,10 @@
   chmod +x $CONFIG_STATUS
   rm -fr confdefs* $ac_clean_files
   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
  +
  +if test ".$enable_batch" != .yes; then
  +    echo ""
  +    echo "Now please type \`${T_MD}make${T_ME}' to compile. Good luck."
  +    echo ""
  +fi
   
  
  
  
  1.2       +21 -6     apache-2.0/src/lib/apr/shmem/unix/mm/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in	1999/08/17 15:59:44	1.1
  +++ configure.in	1999/09/27 07:42:04	1.2
  @@ -6,8 +6,8 @@
   dnl #   standard Autoconf prolog
   dnl #
   
  -AC_PREREQ(2.14)dnl
  -AC_REVISION($Revision: 1.1 $)
  +AC_PREREQ(2.12)dnl
  +AC_REVISION(1.0)dnl
   
   dnl #   shtool bootstrap
   SHTOOL="\$(TOP)/shtool"
  @@ -15,13 +15,13 @@
   ac_shtool="./shtool"
   T_MD=`$ac_shtool echo -n -e %B`
   T_ME=`$ac_shtool echo -n -e %b`
  -PLATFORM=`./config.guess`
  -PLATFORM=`./config.sub $PLATFORM`
  +PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.guess`
  +PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.sub $PLATFORM`
   MM_VERSION_STR="`$ac_shtool version -l c -d long mm_vers.c`"
   AC_SUBST(MM_VERSION_STR)
   
   dnl #   friendly header ;-)
  -echo "${T_MD}Configuring MM library, Version ${MM_VERSION_STR}${T_ME}"
  +echo "Configuring ${T_MD}MM${T_ME} (Shared Memory Library), Version ${T_MD}${MM_VERSION_STR}${T_ME}"
   echo "Copyright (c) 1999 Ralf S. Engelschall, All Rights Reserved."
   echo "Platform: ${T_MD}${PLATFORM}${T_ME}"
   
  @@ -30,6 +30,15 @@
   AC_CONFIG_HEADER(mm_conf.h)dnl
   AC_PREFIX_DEFAULT(/usr/local)
   
  +dnl #   determine build mode
  +AC_ARG_ENABLE(batch,dnl
  +[  --enable-batch          build in batch mode (default=no)],
  +enable_batch="$enableval",
  +if test ".$enable_batch" = .; then
  +    enable_batch=no
  +fi
  +)dnl
  +
   dnl #
   dnl #   determine build tools and parameters
   dnl #
  @@ -161,7 +170,7 @@
   msg=no)
   AC_MSG_RESULT([$msg])
   
  -AC_BEGIN_DECISION([mutual exclusion implementation method])
  +AC_BEGIN_DECISION([mutex implementation method])
   AC_IFALLYES(header:sys/file.h define:LOCK_EX, 
               AC_DECIDE(MM_SEMT_FLOCK, [4.2BSD-style flock() on temporary file]))
   AC_IFALLYES(header:sys/ipc.h header:sys/sem.h header:sys/file.h dnl
  @@ -188,5 +197,11 @@
   ,dnl
   chmod a+x mm-config
   )dnl
  +
  +if test ".$enable_batch" != .yes; then
  +    echo ""
  +    echo "Now please type \`${T_MD}make${T_ME}' to compile. Good luck."
  +    echo ""
  +fi
   
   dnl ##EOF##
  
  
  
  1.2       +5 -2      apache-2.0/src/lib/apr/shmem/unix/mm/fbtool
  
  Index: fbtool
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/fbtool,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fbtool	1999/08/17 15:59:44	1.1
  +++ fbtool	1999/09/27 07:42:04	1.2
  @@ -10,9 +10,11 @@
   fi
   result=`cat .fbtool`
   
  -PLATFORM=`./config.guess`
  -PLATFORM=`./config.sub $PLATFORM`
  +VERSION=`./shtool version -l c -d long mm_vers.c`
   
  +PLATFORM=`/bin/sh ./config.guess`
  +PLATFORM=`/bin/sh ./config.sub $PLATFORM`
  +
   VMPS=`grep MM_VMPS_ mm_conf.h | grep define | sed -e 's;.*MM_;MM_;' -e 's; .*;;'`; \
   SHMT=`grep MM_SHMT_ mm_conf.h | grep define | sed -e 's;.*MM_;MM_;' -e 's; .*;;'`; \
   SEMT=`grep MM_SEMT_ mm_conf.h | grep define | sed -e 's;.*MM_;MM_;' -e 's; .*;;'`; \
  @@ -22,6 +24,7 @@
   rm -f $TMP >/dev/null 2>&1
   touch $TMP
   echo "+-MM-Library-Test-Suite-Summary---------------------------" >>$TMP
  +echo "| Library Version       : MM $VERSION" >>$TMP
   echo "| Platform              : $PLATFORM" >>$TMP
   echo "| Memory Page Size Type : $VMPS" >>$TMP
   echo "| Shared Memory Type    : $SHMT" >>$TMP
  
  
  
  1.2       +110 -60   apache-2.0/src/lib/apr/shmem/unix/mm/ltconfig
  
  Index: ltconfig
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/ltconfig,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ltconfig	1999/08/17 15:59:45	1.1
  +++ ltconfig	1999/09/27 07:42:05	1.2
  @@ -169,8 +169,8 @@
   # Constants:
   PROGRAM=ltconfig
   PACKAGE=libtool
  -VERSION=1.3.2
  -TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
  +VERSION=1.3.3
  +TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
   ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
   ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
   rm="rm -f"
  @@ -181,7 +181,8 @@
   default_ofile=libtool
   can_build_shared=yes
   enable_shared=yes
  -# All known linkers require a `.a' archive for static linking.
  +# All known linkers require a `.a' archive for static linking (except M$VC,
  +# which needs '.lib').
   enable_static=yes
   enable_fast_install=yes
   enable_dlopen=unknown
  @@ -201,6 +202,7 @@
   ac_ext=c
   objext=o
   libext=a
  +exeext=
   cache_file=
   
   old_AR="$AR"
  @@ -576,7 +578,7 @@
     # Now see if the compiler is really GCC.
     with_gcc=no
     echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
  -  echo "$progname:579: checking whether we are using GNU C" >&5
  +  echo "$progname:581: checking whether we are using GNU C" >&5
   
     $rm conftest.c
     cat > conftest.c <<EOF
  @@ -584,7 +586,7 @@
     yes;
   #endif
   EOF
  -  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  +  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
       with_gcc=yes
     fi
     $rm conftest.c
  @@ -598,8 +600,8 @@
   echo $ac_n "checking for object suffix... $ac_c" 1>&6
   $rm conftest*
   echo 'int i = 1;' > conftest.c
  -echo "$progname:601: checking for object suffix" >& 5
  -if { (eval echo $progname:602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
  +echo "$progname:603: checking for object suffix" >& 5
  +if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
     # Append any warnings to the config.log.
     cat conftest.err 1>&5
   
  @@ -617,6 +619,38 @@
   $rm conftest*
   echo "$ac_t$objext" 1>&6
   
  +echo $ac_n "checking for executable suffix... $ac_c" 1>&6
  +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  ac_cv_exeext="no"
  +  $rm conftest*
  +  echo 'main () { return 0; }' > conftest.c
  +  echo "$progname:629: checking for executable suffix" >& 5
  +  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
  +    # Append any warnings to the config.log.
  +    cat conftest.err 1>&5
  +
  +    for ac_file in conftest.*; do
  +      case $ac_file in
  +      *.c | *.err | *.$objext ) ;;
  +      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
  +      esac
  +    done
  +  else
  +    cat conftest.err 1>&5
  +    echo "$progname: failed program was:" >&5
  +    cat conftest.c >&5
  +  fi
  +  $rm conftest*
  +fi
  +if test "X$ac_cv_exeext" = Xno; then
  +  exeext=""
  +else
  +  exeext="$ac_cv_exeext"
  +fi
  +echo "$ac_t$ac_cv_exeext" 1>&6
  +
   echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
   pic_flag=
   special_shlib_compile_flags=
  @@ -739,8 +773,8 @@
     echo "int some_variable = 0;" > conftest.c
     save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $pic_flag -DPIC"
  -  echo "$progname:742: checking if $compiler PIC flag $pic_flag works" >&5
  -  if { (eval echo $progname:743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
  +  echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
  +  if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
       # Append any warnings to the config.log.
       cat conftest.err 1>&5
       
  @@ -792,8 +826,8 @@
   chmod -w .
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -o out/conftest2.o"
  -echo "$progname:795: checking if $compiler supports -c -o file.o" >&5
  -if { (eval echo $progname:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
  +echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
  +if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
   
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
  @@ -825,8 +859,8 @@
     echo "int some_variable = 0;" > conftest.c
     save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -c -o conftest.lo"
  -  echo "$progname:828: checking if $compiler supports -c -o file.lo" >&5
  -if { (eval echo $progname:829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
  +  echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
  +if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
   
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
  @@ -877,8 +911,8 @@
     echo "int some_variable = 0;" > conftest.c
     save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
  -  echo "$progname:880: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  -  if { (eval echo $progname:881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
  +  echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  +  if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
   
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
  @@ -921,8 +955,8 @@
   echo 'main(){return(0);}' > conftest.c
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $link_static_flag"
  -echo "$progname:924: checking if $compiler static flag $link_static_flag works" >&5
  -if { (eval echo $progname:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  +echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
  +if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     echo "$ac_t$link_static_flag" 1>&6
   else
     echo "$ac_t"none 1>&6
  @@ -954,7 +988,7 @@
     if test "$with_gcc" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
  -    echo "$progname:957: checking for ld used by GCC" >&5
  +    echo "$progname:991: checking for ld used by GCC" >&5
       ac_prog=`($CC -print-prog-name=ld) 2>&5`
       case "$ac_prog" in
       # Accept absolute paths.
  @@ -978,10 +1012,10 @@
       esac
     elif test "$with_gnu_ld" = yes; then
       echo $ac_n "checking for GNU ld... $ac_c" 1>&6
  -    echo "$progname:981: checking for GNU ld" >&5
  +    echo "$progname:1015: checking for GNU ld" >&5
     else
       echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
  -    echo "$progname:984: checking for non-GNU ld" >&5
  +    echo "$progname:1018: checking for non-GNU ld" >&5
     fi
   
     if test -z "$LD"; then
  @@ -1047,7 +1081,7 @@
   hardcode_shlibpath_var=unsupported
   runpath_var=
   always_export_symbols=no
  -export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
  +export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
   include_expsyms=
  @@ -1130,10 +1164,9 @@
       # Extract the symbol export list from an `--export-all' def file,
       # then regenerate the def file from the symbol export list, so that
       # the compiled dll only exports the symbol export list.
  -    export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~
  -      sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
  -      (cd $objdir && $CC -c $soname-ltdll.c)~
  -      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs~
  +    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
  +      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
  +      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
         sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
   
       archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
  @@ -1142,13 +1175,15 @@
   	echo "	\$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
   	_lt_hint=`expr 1 + \$_lt_hint`;
         done~
  +      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
  +      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
         $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
         $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
         $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
         $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
         $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
   
  -      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
  +      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
       ;;
   
     netbsd*)
  @@ -1554,11 +1589,11 @@
   main(){nm_test_var='a';nm_test_func();return(0);}
   EOF
   
  -  echo "$progname:1557: checking if global_symbol_pipe works" >&5
  -  if { (eval echo $progname:1558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
  +  echo "$progname:1592: checking if global_symbol_pipe works" >&5
  +  if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
       # Now try to grab the symbols.
       nlist=conftest.nm
  -    if { echo "$progname:1561: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
  +    if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
   
         # Try sorting and uniquifying the output.
         if sort "$nlist" | uniq > "$nlist"T; then
  @@ -1610,7 +1645,7 @@
   	  save_CFLAGS="$CFLAGS"
   	  LIBS="conftstm.$objext"
   	  CFLAGS="$CFLAGS$no_builtin_flag"
  -	  if { (eval echo $progname:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  +	  if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   	    pipe_works=yes
   	  else
   	    echo "$progname: failed program was:" >&5
  @@ -1756,7 +1791,7 @@
     soname_spec='${libname}.so'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
     shlibpath_var=LD_LIBRARY_PATH
  -  deplibs_check_method='file_magic ELF 32-bit LSB shared object'
  +  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
     file_magic_cmd=/usr/bin/file
     file_magic_test_file=/shlib/libc.so
     sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
  @@ -1768,6 +1803,8 @@
   
   cygwin* | mingw*)
     version_type=windows
  +  need_version=no
  +  need_lib_prefix=no
     if test "$with_gcc" = yes; then
       library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
     else
  @@ -1776,7 +1813,6 @@
     dynamic_linker='Win32 ld.exe'
     deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     file_magic_cmd='${OBJDUMP} -f'
  -  need_lib_prefix=no
     # FIXME: first we should search . and the directory the executable is in
     shlibpath_var=PATH
     lt_cv_dlopen="LoadLibrary"
  @@ -1807,11 +1843,22 @@
     esac
     finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir'
     shlibpath_var=LD_LIBRARY_PATH
  +  case "$host_os" in
  +  freebsd2* | freebsd3.[01]*)
  +    shlibpath_overrides_runpath=yes
  +    ;;
  +  *) # from 3.2 on
  +    shlibpath_overrides_runpath=no
  +    ;;
  +  esac
     ;;
   
   gnu*)
     version_type=linux
  -  library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
  +  need_lib_prefix=no
  +  need_version=no
  +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
  +  soname_spec='${libname}${release}.so$major'
     shlibpath_var=LD_LIBRARY_PATH
     ;;
   
  @@ -2120,7 +2167,7 @@
   if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
     lt_cv_dlopen=no lt_cv_dlopen_libs=
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
  -echo "$progname:2123: checking for dlopen in -ldl" >&5
  +echo "$progname:2170: checking for dlopen in -ldl" >&5
   ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -2128,7 +2175,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-ldl  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 2131 "ltconfig"
  +#line 2178 "ltconfig"
   /* Override any gcc2 internal prototype to avoid an error.  */
   /* We use char because int might match the return type of a gcc2
       builtin and then its argument prototype would still apply.  */
  @@ -2138,7 +2185,7 @@
   dlopen()
   ; return 0; }
   EOF
  -if { (eval echo $progname:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo $progname:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -2157,12 +2204,12 @@
   else
     echo "$ac_t""no" 1>&6
   echo $ac_n "checking for dlopen""... $ac_c" 1>&6
  -echo "$progname:2160: checking for dlopen" >&5
  +echo "$progname:2207: checking for dlopen" >&5
   if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2165 "ltconfig"
  +#line 2212 "ltconfig"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char dlopen(); below.  */
   #include <assert.h>
  @@ -2184,7 +2231,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo $progname:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_dlopen=yes"
   else
  @@ -2201,7 +2248,7 @@
   else
     echo "$ac_t""no" 1>&6
   echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
  -echo "$progname:2204: checking for dld_link in -ldld" >&5
  +echo "$progname:2251: checking for dld_link in -ldld" >&5
   ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -2209,7 +2256,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-ldld  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 2212 "ltconfig"
  +#line 2259 "ltconfig"
   /* Override any gcc2 internal prototype to avoid an error.  */
   /* We use char because int might match the return type of a gcc2
       builtin and then its argument prototype would still apply.  */
  @@ -2219,7 +2266,7 @@
   dld_link()
   ; return 0; }
   EOF
  -if { (eval echo $progname:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -2238,12 +2285,12 @@
   else
     echo "$ac_t""no" 1>&6
   echo $ac_n "checking for shl_load""... $ac_c" 1>&6
  -echo "$progname:2241: checking for shl_load" >&5
  +echo "$progname:2288: checking for shl_load" >&5
   if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2246 "ltconfig"
  +#line 2293 "ltconfig"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char shl_load(); below.  */
   #include <assert.h>
  @@ -2265,7 +2312,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo $progname:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_shl_load=yes"
   else
  @@ -2283,7 +2330,7 @@
   else
     echo "$ac_t""no" 1>&6
   echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
  -echo "$progname:2286: checking for shl_load in -ldld" >&5
  +echo "$progname:2333: checking for shl_load in -ldld" >&5
   ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
  @@ -2291,7 +2338,7 @@
     ac_save_LIBS="$LIBS"
   LIBS="-ldld  $LIBS"
   cat > conftest.$ac_ext <<EOF
  -#line 2294 "ltconfig"
  +#line 2341 "ltconfig"
   #include "confdefs.h"
   /* Override any gcc2 internal prototype to avoid an error.  */
   /* We use char because int might match the return type of a gcc2
  @@ -2302,7 +2349,7 @@
   shl_load()
   ; return 0; }
   EOF
  -if { (eval echo $progname:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo $progname:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_lib_$ac_lib_var=yes"
   else
  @@ -2345,17 +2392,17 @@
   for ac_hdr in dlfcn.h; do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "$progname:2348: checking for $ac_hdr" >&5
  +echo "$progname:2395: checking for $ac_hdr" >&5
   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2353 "ltconfig"
  +#line 2400 "ltconfig"
   #include <$ac_hdr>
   int fnord = 0;
   EOF
   ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo $progname:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -2383,7 +2430,7 @@
       LIBS="$lt_cv_dlopen_libs $LIBS"
   
     echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
  -echo "$progname:2386: checking whether a program can dlopen itself" >&5
  +echo "$progname:2433: checking whether a program can dlopen itself" >&5
   if test "${lt_cv_dlopen_self+set}" = set; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -2391,7 +2438,7 @@
       lt_cv_dlopen_self=cross
     else
       cat > conftest.c <<EOF
  -#line 2394 "ltconfig"
  +#line 2441 "ltconfig"
   
   #if HAVE_DLFCN_H
   #include <dlfcn.h>
  @@ -2434,10 +2481,10 @@
   fnord() { int i=42;}
   main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
       if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
  -	       if(ptr1 || ptr2) exit(0); } exit(1); } 
  +	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
   
   EOF
  -if { (eval echo $progname:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   then
     lt_cv_dlopen_self=yes
   else
  @@ -2456,7 +2503,7 @@
     if test "$lt_cv_dlopen_self" = yes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
     echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
  -echo "$progname:2459: checking whether a statically linked program can dlopen itself" >&5
  +echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5
   if test "${lt_cv_dlopen_self_static+set}" = set; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
  @@ -2464,7 +2511,7 @@
       lt_cv_dlopen_self_static=cross
     else
       cat > conftest.c <<EOF
  -#line 2467 "ltconfig"
  +#line 2514 "ltconfig"
   
   #if HAVE_DLFCN_H
   #include <dlfcn.h>
  @@ -2507,10 +2554,10 @@
   fnord() { int i=42;}
   main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
       if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
  -    if(ptr1 || ptr2) exit(0); } exit(1); } 
  +    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
   
   EOF
  -if { (eval echo $progname:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  +if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
   then
     lt_cv_dlopen_self_static=yes
   else
  @@ -2729,6 +2776,9 @@
   # Old archive suffix (normally "a").
   libext="$libext"
   
  +# Executable file suffix (normally "").
  +exeext="$exeext"
  +
   # Additional compiler flags for building library objects.
   pic_flag=$pic_flag
   
  @@ -2897,7 +2947,7 @@
     esac
   
     # Append the ltmain.sh script.
  -  cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
  +  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
   
     chmod +x "$ofile"
     ;;
  
  
  
  1.2       +144 -65   apache-2.0/src/lib/apr/shmem/unix/mm/ltmain.sh
  
  Index: ltmain.sh
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/ltmain.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ltmain.sh	1999/08/17 15:59:45	1.1
  +++ ltmain.sh	1999/09/27 07:42:05	1.2
  @@ -54,8 +54,8 @@
   # Constants.
   PROGRAM=ltmain.sh
   PACKAGE=libtool
  -VERSION=1.3.2
  -TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
  +VERSION=1.3.3
  +TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
   
   default_mode=
   help="Try \`$progname --help' for more information."
  @@ -69,7 +69,7 @@
   Xsed='sed -e 1s/^X//'
   sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
   SP2NL='tr \040 \012'
  -NL2SP='tr \012 \040'
  +NL2SP='tr \015\012 \040\040'
   
   # NLS nuisances.
   # Only set LANG and LC_ALL to C if already set.
  @@ -638,6 +638,12 @@
   # #undef WIN32_LEAN_AND_MEAN
   # #include <stdio.h>
   #
  +# #ifndef __CYGWIN__
  +# #  ifdef __CYGWIN32__
  +# #    define __CYGWIN__ __CYGWIN32__
  +# #  endif
  +# #endif
  +#
   # #ifdef __cplusplus
   # extern "C" {
   # #endif
  @@ -646,8 +652,10 @@
   # }
   # #endif
   #
  +# #ifdef __CYGWIN__
   # #include <cygwin/cygwin_dll.h>
   # DECLARE_CYGWIN_DLL( DllMain );
  +# #endif
   # HINSTANCE __hDllInstance_base;
   #
   # BOOL APIENTRY
  @@ -893,6 +901,14 @@
   	  fi
   	  case "$arg" in
   	  *.la | *.lo) ;;  # We handle these cases below.
  +	  force)
  +	    if test "$dlself" = no; then
  +	      dlself=needless
  +	      export_dynamic=yes
  +	    fi
  +	    prev=
  +	    continue
  +	    ;;
   	  self)
   	    if test "$prev" = dlprefiles; then
   	      dlself=yes
  @@ -1222,7 +1238,7 @@
   	fi
   
   	if test -n "$dependency_libs"; then
  -	  # Extract -R from dependency_libs
  +	  # Extract -R and -L from dependency_libs
   	  temp_deplibs=
   	  for deplib in $dependency_libs; do
   	    case "$deplib" in
  @@ -1234,7 +1250,13 @@
   	    -L*) case "$compile_command $temp_deplibs " in
   		 *" $deplib "*) ;;
   		 *) temp_deplibs="$temp_deplibs $deplib";;
  -		 esac;;
  +		 esac
  +		 temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
  +		 case " $lib_search_path " in
  +		 *" $temp_dir "*) ;;
  +		 *) lib_search_path="$lib_search_path $temp_dir";;
  +		 esac
  +		 ;;
   	    *) temp_deplibs="$temp_deplibs $deplib";;
   	    esac
   	  done
  @@ -2037,51 +2059,6 @@
   	# Use standard objects if they are pic
   	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
   
  -	if test -n "$whole_archive_flag_spec"; then
  -	  if test -n "$convenience"; then
  -	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  -	  fi
  -	else
  -	  gentop="$output_objdir/${outputname}x"
  -	  $show "${rm}r $gentop"
  -	  $run ${rm}r "$gentop"
  -	  $show "mkdir $gentop"
  -	  $run mkdir "$gentop"
  -	  status=$?
  -	  if test $status -ne 0 && test ! -d "$gentop"; then
  -	    exit $status
  -	  fi
  -	  generated="$generated $gentop"
  -	  
  -	  for xlib in $convenience; do
  -	    # Extract the objects.
  -	    case "$xlib" in
  -	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
  -	    *) xabs=`pwd`"/$xlib" ;;
  -	    esac
  -	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
  -	    xdir="$gentop/$xlib"
  -
  -	    $show "${rm}r $xdir"
  -	    $run ${rm}r "$xdir"
  -	    $show "mkdir $xdir"
  -	    $run mkdir "$xdir"
  -	    status=$?
  -	    if test $status -ne 0 && test ! -d "$xdir"; then
  -	      exit $status
  -	    fi
  -	    $show "(cd $xdir && $AR x $xabs)"
  -	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
  -
  -	    libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
  -	  done
  -	fi
  -
  -	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  -	  eval flag=\"$thread_safe_flag_spec\"
  -	  linkopts="$linkopts $flag"
  -	fi
  -
   	# Prepare the list of exported symbols
   	if test -z "$export_symbols"; then
   	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
  @@ -2109,6 +2086,51 @@
   	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
   	fi
   
  +	if test -n "$convenience"; then
  +	  if test -n "$whole_archive_flag_spec"; then
  +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  +	  else
  +	    gentop="$output_objdir/${outputname}x"
  +	    $show "${rm}r $gentop"
  +	    $run ${rm}r "$gentop"
  +	    $show "mkdir $gentop"
  +	    $run mkdir "$gentop"
  +	    status=$?
  +	    if test $status -ne 0 && test ! -d "$gentop"; then
  +	      exit $status
  +	    fi
  +	    generated="$generated $gentop"
  +
  +	    for xlib in $convenience; do
  +	      # Extract the objects.
  +	      case "$xlib" in
  +	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
  +	      *) xabs=`pwd`"/$xlib" ;;
  +	      esac
  +	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
  +	      xdir="$gentop/$xlib"
  +
  +	      $show "${rm}r $xdir"
  +	      $run ${rm}r "$xdir"
  +	      $show "mkdir $xdir"
  +	      $run mkdir "$xdir"
  +	      status=$?
  +	      if test $status -ne 0 && test ! -d "$xdir"; then
  +		exit $status
  +	      fi
  +	      $show "(cd $xdir && $AR x $xabs)"
  +	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
  +
  +	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
  +	    done
  +	  fi
  +	fi
  +
  +	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  +	  eval flag=\"$thread_safe_flag_spec\"
  +	  linkopts="$linkopts $flag"
  +	fi
  +
   	# Do each of the archive commands.
   	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
   	  eval cmds=\"$archive_expsym_cmds\"
  @@ -2187,8 +2209,58 @@
         # Delete the old objects.
         $run $rm $obj $libobj
   
  +      # Objects from convenience libraries.  This assumes
  +      # single-version convenience libraries.  Whenever we create
  +      # different ones for PIC/non-PIC, this we'll have to duplicate
  +      # the extraction.
  +      reload_conv_objs=
  +      gentop=
  +      # reload_cmds runs $LD directly, so let us get rid of
  +      # -Wl from whole_archive_flag_spec
  +      wl= 
  +
  +      if test -n "$convenience"; then
  +	if test -n "$whole_archive_flag_spec"; then
  +	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
  +	else
  +	  gentop="$output_objdir/${obj}x"
  +	  $show "${rm}r $gentop"
  +	  $run ${rm}r "$gentop"
  +	  $show "mkdir $gentop"
  +	  $run mkdir "$gentop"
  +	  status=$?
  +	  if test $status -ne 0 && test ! -d "$gentop"; then
  +	    exit $status
  +	  fi
  +	  generated="$generated $gentop"
  +
  +	  for xlib in $convenience; do
  +	    # Extract the objects.
  +	    case "$xlib" in
  +	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
  +	    *) xabs=`pwd`"/$xlib" ;;
  +	    esac
  +	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
  +	    xdir="$gentop/$xlib"
  +
  +	    $show "${rm}r $xdir"
  +	    $run ${rm}r "$xdir"
  +	    $show "mkdir $xdir"
  +	    $run mkdir "$xdir"
  +	    status=$?
  +	    if test $status -ne 0 && test ! -d "$xdir"; then
  +	      exit $status
  +	    fi
  +	    $show "(cd $xdir && $AR x $xabs)"
  +	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
  +
  +	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
  +	  done
  +	fi
  +      fi
  +
         # Create the old-style object.
  -      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
  +      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
   
         output="$obj"
         eval cmds=\"$reload_cmds\"
  @@ -2201,9 +2273,21 @@
         IFS="$save_ifs"
   
         # Exit if we aren't doing a library object file.
  -      test -z "$libobj" && exit 0
  +      if test -z "$libobj"; then
  +	if test -n "$gentop"; then
  +	  $show "${rm}r $gentop"
  +	  $run ${rm}r $gentop
  +	fi
  +
  +	exit 0
  +      fi
   
         if test "$build_libtool_libs" != yes; then
  +	if test -n "$gentop"; then
  +	  $show "${rm}r $gentop"
  +	  $run ${rm}r $gentop
  +	fi
  +
   	# Create an invalid libtool object if no PIC, so that we don't
   	# accidentally link it into a program.
   	$show "echo timestamp > $libobj"
  @@ -2213,7 +2297,7 @@
   
         if test -n "$pic_flag"; then
   	# Only do commands if we really have different PIC objects.
  -	reload_objs="$libobjs"
  +	reload_objs="$libobjs $reload_conv_objs"
   	output="$libobj"
   	eval cmds=\"$reload_cmds\"
   	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
  @@ -2231,6 +2315,11 @@
   	$run $LN_S $obj $libobj || exit $?
         fi
   
  +      if test -n "$gentop"; then
  +	$show "${rm}r $gentop"
  +	$run ${rm}r $gentop
  +      fi
  +
         exit 0
         ;;
   
  @@ -2363,7 +2452,7 @@
         fi
   
         dlsyms=
  -      if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then
  +      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
   	if test -n "$NM" && test -n "$global_symbol_pipe"; then
   	  dlsyms="${outputname}S.c"
   	else
  @@ -2776,7 +2865,7 @@
     fi"
   	else
   	  echo >> $output "\
  -  program='$outputname'
  +  program='$outputname$exeext'
     progdir=\"\$thisdir/$objdir\"
   "
   	fi
  @@ -3201,13 +3290,11 @@
   	  # Install the shared library and build the symlinks.
   	  $show "$install_prog $dir/$realname $destdir/$realname"
   	  $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
  -	  test "X$dlname" = "X$realname" && dlname=
   
   	  if test $# -gt 0; then
   	    # Delete the old symlinks, and create new ones.
   	    for linkname
   	    do
  -	      test "X$dlname" = "X$linkname" && dlname=
   	      if test "$linkname" != "$realname"; then
   		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
   		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
  @@ -3215,12 +3302,6 @@
   	    done
   	  fi
   
  -	  if test -n "$dlname"; then
  -	    # Install the dynamically-loadable library.
  -	    $show "$install_prog $dir/$dlname $destdir/$dlname"
  -	    $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
  -	  fi
  -
   	  # Do each command in the postinstall commands.
   	  lib="$destdir/$realname"
   	  eval cmds=\"$postinstall_cmds\"
  @@ -3652,9 +3733,7 @@
   	  # Delete the libtool libraries and symlinks.
   	  for n in $library_names; do
   	    rmfiles="$rmfiles $dir/$n"
  -	    test "X$n" = "X$dlname" && dlname=
   	  done
  -	  test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
   	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
   
   	  $show "$rm $rmfiles"
  
  
  
  1.2       +5 -5      apache-2.0/src/lib/apr/shmem/unix/mm/mm-config.1
  
  Index: mm-config.1
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm-config.1,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm-config.1	1999/08/17 15:59:45	1.1
  +++ mm-config.1	1999/09/27 07:42:06	1.2
  @@ -1,11 +1,11 @@
   .rn '' }`
  -''' $RCSfile: mm-config.1,v $$Revision: 1.1 $$Date: 1999/08/17 15:59:45 $
  +''' $RCSfile: mm-config.1,v $$Revision: 1.2 $$Date: 1999/09/27 07:42:06 $
   '''
   ''' $Log: mm-config.1,v $
  -''' Revision 1.1  1999/08/17 15:59:45  rbb
  -''' Initial revision
  +''' Revision 1.2  1999/09/27 07:42:06  rse
  +''' Update the MM version APR contains to a more recent one.
   '''
  -''' Revision 1.2  1999/03/28 11:45:32  rse
  +''' Revision 1.7  1999/09/06 11:32:17  rse
   ''' *** empty log message ***
   '''
   '''
  @@ -99,7 +99,7 @@
   .nr % 0
   .rr F
   .\}
  -.TH mm-config 3 "28-Mar-1999" "MM 1.0.0" "Shared Memory Library"
  +.TH MM-CONFIG 1 "06-Sep-1999" "MM 1.0.11" "Shared Memory Library"
   .UC
   .if n .hy 0
   .if n .na
  @@ -196,7 +196,7 @@
   .SH "NAME"
   \fBmm-config\fR \- MM library configuration/build utility
   .SH "VERSION"
  -MM 1.0.0 (28-Mar-1999)
  +MM 1.0.11 (06-Sep-1999)
   .SH "SYNOPSIS"
   \fBmm-config\fR 
   [\fB--help\fR]
  @@ -252,7 +252,7 @@
   .Ve
   
   .rn }` ''
  -.IX Title "mm-config 3"
  +.IX Title "MM-CONFIG 1"
   .IX Name "B<mm-config> - MM library configuration/build utility"
   
   .IX Header "NAME"
  
  
  
  1.2       +67 -13    apache-2.0/src/lib/apr/shmem/unix/mm/mm-config.in
  
  Index: mm-config.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm-config.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm-config.in	1999/08/17 15:59:45	1.1
  +++ mm-config.in	1999/09/27 07:42:07	1.2
  @@ -1,8 +1,46 @@
   #!/bin/sh
   ##
  -##  mm-config -- MM library build configuration utility
  -##  Copyright (c) 1999 Ralf S. Engelschall, All Rights Reserved. 
  +## mm-config -- MM library build configuration utility
   ##
  +## ====================================================================
  +## Copyright (c) 1999 Ralf S. Engelschall. All rights reserved.
  +##
  +## Redistribution and use in source and binary forms, with or without
  +## modification, are permitted provided that the following conditions
  +## are met:
  +##
  +## 1. Redistributions of source code must retain the above copyright
  +##    notice, this list of conditions and the following disclaimer. 
  +##
  +## 2. Redistributions in binary form must reproduce the above copyright
  +##    notice, this list of conditions and the following disclaimer in
  +##    the documentation and/or other materials provided with the
  +##    distribution.
  +##
  +## 3. All advertising materials mentioning features or use of this
  +##    software must display the following acknowledgment:
  +##    "This product includes software developed by
  +##     Ralf S. Engelschall <rse@engelschall.com>."
  +##
  +## 4. Redistributions of any form whatsoever must retain the following
  +##    acknowledgment:
  +##    "This product includes software developed by
  +##     Ralf S. Engelschall <rse@engelschall.com>."
  +##
  +## THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
  +## EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  +## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL RALF S. ENGELSCHALL OR
  +## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  +## NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  +## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +## HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +## STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +## OF THE POSSIBILITY OF SUCH DAMAGE.
  +## ====================================================================
  +
   DIFS=' 	
   '
   
  @@ -21,12 +59,15 @@
   help=no
   version=no
   
  -usage="$0 [--help] [--version] [--cflags] [--ldflags] [--libs]"
  +usage="mm-config [--help] [--version] [--all] [--cflags] [--ldflags] [--libs]"
   if [ $# -eq 0 ]; then
  -    echo "$0:Error: Invalid option" 1>&2
  -    echo "$0:Usage: $usage" 1>&2
  +    echo "mm-config:Error: Invalid option" 1>&2
  +    echo "mm-config:Usage: $usage" 1>&2
       exit 1
   fi
  +output=""
  +output_extra=""
  +all=no
   prev=''
   OIFS="$IFS" IFS="$DIFS"
   for option
  @@ -42,32 +83,45 @@
       esac
       case "$option" in
           --help|-h) 
  -            echo "$0:Usage: $usage"
  -            exit 1
  +            echo "Usage: $usage"
  +            echo "Report bugs to rse@engelschall.com"
  +            exit 0
               ;;
           --version|-v)
               echo "MM $mm_version"
               exit 0
               ;;
  +        --all)
  +            all=yes
  +            ;;
           --cflags)
  -            echo "-I$mm_includedir"
  +            output="$output -I$mm_includedir"
  +            output_extra="$output_extra $mm_cflags"
               ;;
           --ldflags)
  -            echo "-L$mm_libdir"
  +            output="$output -L$mm_libdir"
  +            output_extra="$output_extra $mm_ldflags"
               ;;
           --libs)
  -            echo "-lmm"
  +            output="$output -lmm"
  +            output_extra="$output_extra $mm_libs"
               ;;
           * )             
  -            echo "$0:Error: Invalid option" 1>&2
  -            echo "$0:Usage: $usage" 1>&2
  +            echo "mm-config:Error: Invalid option" 1>&2
  +            echo "mm-config:Usage: $usage" 1>&2
               exit 1;
               ;;
       esac
   done
   IFS="$OIFS"
   if [ ".$prev" != . ]; then
  -    echo "$0:Error: missing argument to --`echo $prev | sed 's/_/-/g'`" 1>&2
  +    echo "mm-config:Error: missing argument to --`echo $prev | sed 's/_/-/g'`" 1>&2
       exit 1
  +fi
  +if [ ".$output" != . ]; then
  +    if [ ".$all" = .yes ]; then
  +        output="$output $output_extra"
  +    fi
  +    echo $output
   fi
   
  
  
  
  1.2       +12 -12    apache-2.0/src/lib/apr/shmem/unix/mm/mm.3
  
  Index: mm.3
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.3,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm.3	1999/08/17 15:59:45	1.1
  +++ mm.3	1999/09/27 07:42:07	1.2
  @@ -1,9 +1,9 @@
   .rn '' }`
  -''' $RCSfile: mm.3,v $$Revision: 1.1 $$Date: 1999/08/17 15:59:45 $
  +''' $RCSfile: mm.3,v $$Revision: 1.2 $$Date: 1999/09/27 07:42:07 $
   '''
   ''' $Log: mm.3,v $
  -''' Revision 1.1  1999/08/17 15:59:45  rbb
  -''' Initial revision
  +''' Revision 1.2  1999/09/27 07:42:07  rse
  +''' Update the MM version APR contains to a more recent one.
   '''
   '''
   .de Sh
  @@ -96,7 +96,7 @@
   .nr % 0
   .rr F
   .\}
  -.TH mm 3 "24-Jun-1999" "MM 1.0.8" "Shared Memory Library"
  +.TH mm 3 "06-Sep-1999" "MM 1.0.11" "Shared Memory Library"
   .UC
   .if n .hy 0
   .if n .na
  @@ -193,7 +193,7 @@
   .SH "NAME"
   \fBMM \- Shared Memory Library\fR
   .SH "VERSION"
  -MM 1.0.8 (24-Jun-1999)
  +MM 1.0.11 (06-Sep-1999)
   .SH "SYNOPSIS"
   .PP
   .Vb 1
  @@ -278,15 +278,15 @@
   useful when converting \fIheap\fR based data structures to \fIshared memory\fR
   based data structures without the need to change the code dramatically.  All
   which is needed is to prefix the \s-1POSIX\s0.1 memory allocation functions with
  -\f(CWMM_\fR, i.e. \f(CWmalloc\fR becomes \f(CWMM_malloc\fR, \f(CWstrdup\fR becomes \f(CWMM_strdup\fR,
  -etc. This \s-1API\s0 internally uses just a global \f(CWMM*\fR pool for calling the
  -corresponding functions (with prefix \f(CWmm_\fR) of the \fIStandard Malloc-Style
  -\s-1API\s0\fR.
  +`\f(CWMM_\fR\*(R', i.e. `\f(CWmalloc\fR\*(R' becomes `\f(CWMM_malloc\fR\*(R', `\f(CWstrdup\fR\*(R' becomes
  +`\f(CWMM_strdup\fR\*(R', etc. This \s-1API\s0 internally uses just a global `\f(CWMM *\fR\*(R' pool for
  +calling the corresponding functions (with prefix `\f(CWmm_\fR') of the \fIStandard
  +Malloc-Style \s-1API\s0\fR.
   .Ip "\fBStandard Malloc-Style \s-1API\s0\fR" 4
  -This is the standard high-level memory allocation \s-1API\s0. It's interface is
  -similar to the \fIGlobal Malloc-Replacement \s-1API\s0\fR but it uses an explicit \f(CWMM*\fR
  +This is the standard high-level memory allocation \s-1API\s0. Its interface is
  +similar to the \fIGlobal Malloc-Replacement \s-1API\s0\fR but it uses an explicit `\f(CWMM *\fR\*(R'
   pool to operate on. That's why every function of this \s-1API\s0 has an argument of
  -type \f(CWMM*\fR as the first argument.  This \s-1API\s0 provides a comfortable way to
  +type `\f(CWMM *\fR\*(R' as the first argument.  This \s-1API\s0 provides a comfortable way to
   work with small dynamically allocated shared memory chunks inside large
   statically allocated shared memory segments. It's internally based on the
   \fILow-Level Shared Memory \s-1API\s0\fR for creating the underlaying shared memory
  @@ -455,7 +455,7 @@
   perform either shared/read-only (\fImode\fR is \f(CWMM_LOCK_RD\fR) or
   exclusive/read-write (\fImode\fR is \f(CWMM_LOCK_RW\fR) operations inside the global
   shared memory pool.
  -.Ip "int \fBMM_unlock\fR(\s-1MM\s0 *\fImm\fR);" 4
  +.Ip "int \fBmm_unlock\fR(\s-1MM\s0 *\fImm\fR);" 4
   This unlocks the shared memory pool \fImm\fR for the current process after mutual
   exclusion operations were performed inside the global shared memory pool.
   .Ip "void *\fBmm_malloc\fR(\s-1MM\s0 *\fImm\fR, size_t \fIsize\fR);" 4
  @@ -597,7 +597,7 @@
   HTTP server project (see www.apache.org), which was originally invented for
   \fBmod_ssl\fR (see http://www.modssl.org/). 
   .PP
  -It's base idea (a malloc-style API for handling shared memory) was originally
  +Its base idea (a malloc-style API for handling shared memory) was originally
   derived from the non-publically available \fImm_malloc\fR library written in
   October 1997 by \fICharles Randall\fR <crandall@matchlogic.com> for MatchLogic,
   Inc.
  @@ -697,7 +697,7 @@
   
   .IX Item "int \fBmm_lock\fR(\s-1MM\s0 *\fImm\fR, mm_lock_mode \fImode\fR);"
   
  -.IX Item "int \fBMM_unlock\fR(\s-1MM\s0 *\fImm\fR);"
  +.IX Item "int \fBmm_unlock\fR(\s-1MM\s0 *\fImm\fR);"
   
   .IX Item "void *\fBmm_malloc\fR(\s-1MM\s0 *\fImm\fR, size_t \fIsize\fR);"
   
  
  
  
  1.2       +10 -9     apache-2.0/src/lib/apr/shmem/unix/mm/mm.h
  
  Index: mm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm.h	1999/08/17 15:59:45	1.1
  +++ mm.h	1999/09/27 07:42:08	1.2
  @@ -62,6 +62,10 @@
   #include <sys/types.h>
   #include <sys/stat.h>
   
  +typedef enum { 
  +    MM_LOCK_RD, MM_LOCK_RW
  +} mm_lock_mode;
  +
   /*
   **  ____ Private Part of the API ___________________________
   */
  @@ -78,13 +82,14 @@
   #include <sys/types.h>
   
   #ifdef MM_OS_SUNOS
  +#define KERNEL 1
   #include <memory.h>
   /* SunOS lacks prototypes */
  -extern int getpagesize(void);
  -extern int munmap(caddr_t addr, int len);
  -extern int ftruncate(int fd, off_t length);
  -extern int flock(int fd, int operation);
  -extern char *strerror (int err);
  +extern int   getpagesize(void);
  +extern int   munmap(caddr_t, int);
  +extern int   ftruncate(int, off_t);
  +extern int   flock(int, int);
  +extern char *strerror(int);
   #endif
   
   #if !defined(FALSE)
  @@ -288,10 +293,6 @@
   #else
   typedef void MM;
   #endif
  -
  -typedef enum { 
  -    MM_LOCK_RD, MM_LOCK_RW
  -} mm_lock_mode;
   
   /* Global Malloc-Replacement API */
   int     MM_create(size_t size, const char *file);
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/shmem/unix/mm/mm.pod
  
  Index: mm.pod
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.pod,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm.pod	1999/08/17 15:59:45	1.1
  +++ mm.pod	1999/09/27 07:42:08	1.2
  @@ -137,17 +137,17 @@
   useful when converting I<heap> based data structures to I<shared memory>
   based data structures without the need to change the code dramatically.  All
   which is needed is to prefix the POSIX.1 memory allocation functions with
  -C<MM_>, i.e. C<malloc> becomes C<MM_malloc>, C<strdup> becomes C<MM_strdup>,
  -etc. This API internally uses just a global C<MM*> pool for calling the
  -corresponding functions (with prefix C<mm_>) of the I<Standard Malloc-Style
  -API>.
  +`C<MM_>', i.e. `C<malloc>' becomes `C<MM_malloc>', `C<strdup>' becomes
  +`C<MM_strdup>', etc. This API internally uses just a global `C<MM *>' pool for
  +calling the corresponding functions (with prefix `C<mm_>') of the I<Standard
  +Malloc-Style API>.
   
   =item B<Standard Malloc-Style API>
   
  -This is the standard high-level memory allocation API. It's interface is
  -similar to the I<Global Malloc-Replacement API> but it uses an explicit C<MM*>
  +This is the standard high-level memory allocation API. Its interface is
  +similar to the I<Global Malloc-Replacement API> but it uses an explicit `C<MM *>'
   pool to operate on. That's why every function of this API has an argument of
  -type C<MM*> as the first argument.  This API provides a comfortable way to
  +type `C<MM *>' as the first argument.  This API provides a comfortable way to
   work with small dynamically allocated shared memory chunks inside large
   statically allocated shared memory segments. It's internally based on the
   I<Low-Level Shared Memory API> for creating the underlaying shared memory
  @@ -405,7 +405,7 @@
   exclusive/read-write (I<mode> is C<MM_LOCK_RW>) operations inside the global
   shared memory pool.
   
  -=item int B<MM_unlock>(MM *I<mm>);
  +=item int B<mm_unlock>(MM *I<mm>);
   
   This unlocks the shared memory pool I<mm> for the current process after mutual
   exclusion operations were performed inside the global shared memory pool.
  @@ -618,7 +618,7 @@
   HTTP server project (see www.apache.org), which was originally invented for
   B<mod_ssl> (see http://www.modssl.org/). 
   
  -It's base idea (a malloc-style API for handling shared memory) was originally
  +Its base idea (a malloc-style API for handling shared memory) was originally
   derived from the non-publically available I<mm_malloc> library written in
   October 1997 by I<Charles Randall> <crandall@matchlogic.com> for MatchLogic,
   Inc.
  
  
  
  1.3       +5 -5      apache-2.0/src/lib/apr/shmem/unix/mm/mm_alloc.c
  
  Index: mm_alloc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_alloc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mm_alloc.c	1999/08/31 05:32:50	1.2
  +++ mm_alloc.c	1999/09/27 07:42:08	1.3
  @@ -77,7 +77,7 @@
       if ((core = mm_core_create(size, file)) == NULL)
           return NULL;
   
  -    /* fill in the memory ap_context_t structure */
  +    /* fill in the memory pool structure */
       mm = (MM *)core;
       mm->mp_size    = size;
       mm->mp_offset  = SIZEOF_mem_pool;
  @@ -115,21 +115,21 @@
   }
   
   /*
  - * Lock a memory ap_context_t 
  + * Lock a memory pool 
    */
   int mm_lock(MM *mm, mm_lock_mode mode)
   {
  -    if (mm == NULL);
  +    if (mm == NULL)
           return FALSE;
       return mm_core_lock((void *)mm, mode);
   }
   
   /*
  - * Unlock a memory ap_context_t 
  + * Unlock a memory pool 
    */
   int mm_unlock(MM *mm)
   {
  -    if (mm == NULL);
  +    if (mm == NULL)
           return FALSE;
       return mm_core_unlock((void *)mm);
   }
  
  
  
  1.2       +4 -4      apache-2.0/src/lib/apr/shmem/unix/mm/mm_core.c
  
  Index: mm_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_core.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm_core.c	1999/08/17 15:59:45	1.1
  +++ mm_core.c	1999/09/27 07:42:09	1.2
  @@ -232,7 +232,7 @@
   
   #if defined(MM_SHMT_MMANON)
       if ((area = (void *)mmap(NULL, size, PROT_READ|PROT_WRITE, 
  -                             MAP_ANON|MAP_SHARED, -1, 0)) == MAP_FAILED)
  +                             MAP_ANON|MAP_SHARED, -1, 0)) == (void *)MAP_FAILED)
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to memory map anonymous area");
   #endif /* MM_SHMT_MMANON */
   
  @@ -244,7 +244,7 @@
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to truncate tempfile");
       write(fdmem, &zero, sizeof(zero));
       if ((area = (void *)mmap(NULL, size, PROT_READ|PROT_WRITE, 
  -                             MAP_SHARED, fdmem, mm_core_mapoffset)) == MAP_FAILED)
  +                             MAP_SHARED, fdmem, mm_core_mapoffset)) == (void *)MAP_FAILED)
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to memory map tempfile");
       shm_unlink(fnmem);
       mm_core_mapoffset += size;
  @@ -257,7 +257,7 @@
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to seek in /dev/zero");
       write(fdmem, &zero, sizeof(zero));
       if ((area = (void *)mmap(NULL, size, PROT_READ|PROT_WRITE, 
  -                             MAP_SHARED, fdmem, mm_core_mapoffset)) == MAP_FAILED)
  +                             MAP_SHARED, fdmem, mm_core_mapoffset)) == (void *)MAP_FAILED)
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to memory map /dev/zero");
       mm_core_mapoffset += size;
   #endif /* MM_SHMT_MMZERO */
  @@ -270,7 +270,7 @@
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to truncate memory file");
       write(fdmem, &zero, sizeof(zero));
       if ((area = (void *)mmap(NULL, size, PROT_READ|PROT_WRITE, 
  -                             MAP_SHARED, fdmem, mm_core_mapoffset)) == MAP_FAILED)
  +                             MAP_SHARED, fdmem, mm_core_mapoffset)) == (void *)MAP_FAILED)
           FAIL(MM_ERR_CORE|MM_ERR_SYSTEM, "failed to memory map memory file");
       mm_core_mapoffset += size;
   #endif /* MM_SHMT_MMFILE */
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/shmem/unix/mm/mm_test.c
  
  Index: mm_test.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_test.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm_test.c	1999/08/17 15:59:45	1.1
  +++ mm_test.c	1999/09/27 07:42:10	1.2
  @@ -209,7 +209,7 @@
           FAILED_IF(1);
       }
       else {
  -        fprintf(stderr, "Fine, we've again %d bytes available\n", s2);
  +        fprintf(stderr, "Fine, we have again %d bytes available\n", s2);
       }
       
       fprintf(stderr, "Destroying MM object\n");
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/shmem/unix/mm/mm_vers.c
  
  Index: mm_vers.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_vers.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mm_vers.c	1999/08/17 15:59:45	1.1
  +++ mm_vers.c	1999/09/27 07:42:10	1.2
  @@ -7,7 +7,7 @@
   
   #ifndef _MM_VERS_C
   #define _MM_VERS_C
  -#define MM_VERSION 0x100208
  +#define MM_VERSION 0x100211
   extern const int  MM_Version;
   extern const char MM_VersionStr[];
   extern const char MM_Hello[];
  @@ -20,13 +20,13 @@
   
   #else
   
  -const int  MM_Version      = 0x100208;
  -const char MM_VersionStr[] = "1.0.8 (24-Jun-1999)";
  -const char MM_Hello[]      = "This is MM, Version 1.0.8 (24-Jun-1999)";
  -const char MM_GNUVersion[] = "MM Version 1.0.8";
  -const char MM_WhatID[]     = "@(#)MM Version 1.0.8 (24-Jun-1999)";
  -const char MM_RCSIdentID[] = "$Id: mm_vers.c,v 1.1 1999/08/17 15:59:45 rbb Exp $";
  -const char MM_WebID[]      = "MM/1.0.8";
  -const char MM_PlainID[]    = "1.0.8";
  +const int  MM_Version      = 0x100211;
  +const char MM_VersionStr[] = "1.0.11 (06-Sep-1999)";
  +const char MM_Hello[]      = "This is MM, Version 1.0.11 (06-Sep-1999)";
  +const char MM_GNUVersion[] = "MM Version 1.0.11";
  +const char MM_WhatID[]     = "@(#)MM Version 1.0.11 (06-Sep-1999)";
  +const char MM_RCSIdentID[] = "$Id: mm_vers.c,v 1.2 1999/09/27 07:42:10 rse Exp $";
  +const char MM_WebID[]      = "MM/1.0.11";
  +const char MM_PlainID[]    = "1.0.11";
   
   #endif
  
  
  
  1.2       +571 -241  apache-2.0/src/lib/apr/shmem/unix/mm/shtool
  
  Index: shtool
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/shtool,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shtool	1999/08/17 15:59:45	1.1
  +++ shtool	1999/09/27 07:42:10	1.2
  @@ -6,7 +6,8 @@
   ##  See http://www.gnu.org/software/shtool/ for more information.
   ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
   ##
  -##  Version 1.3.0-dev (23-Jun-1999)
  +##  Version 1.4.6 (05-Sep-1999)
  +##  Ingredients: all available modules
   ##
   
   ##
  @@ -39,7 +40,7 @@
   ##  Available commands:
   ##    echo       Print string with optional construct expansion
   ##    mdate      Pretty-print modification time of a file or dir
  -##    table      Pretty print a field-sperarated list as a table
  +##    table      Pretty print a field-separated list as a table
   ##    prop       Display progress with a running propeller
   ##    move       Move files with simultan substitution
   ##    install    Install a program, script or datafile
  @@ -47,6 +48,7 @@
   ##    mkln       Make link with calculation of relative paths
   ##    mkshadow   Make a shadow tree
   ##    fixperm    Fix file permissions inside a source tree
  +##    tarball    Roll distribution tarballs
   ##    guessos    Simple OS/platform guesser
   ##    arx        Extended archive command
   ##    slo        Separate linker options by library class
  @@ -56,34 +58,38 @@
   ##
   
   if [ $# -eq 0 ]; then
  -    echo "$0:ERROR: invalid command line" 1>&2
  -    echo "$0:HINT:  run \`$0 -h' for usage" 1>&2
  +    echo "$0:Error: invalid command line" 1>&2
  +    echo "$0:Hint:  run \`$0 -h' for usage" 1>&2
       exit 1
   fi
   if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
  -    echo "This is shtool, version 1.3.0 (23-Jun-1999)"
  +    echo "This is GNU shtool, version 1.4.6 (05-Sep-1999)"
       echo "Copyright (c) 1994-1999 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>]]" 
       echo ''
       echo 'Available global <options>:'
       echo '  -v, --version   display shtool version information'
       echo '  -h, --help      display shtool usage help page (this one)'
  +    echo '  -d, --debug     display shell trace information'
       echo ''
       echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
       echo '  echo     [-n] [-e] [<str> ...]'
       echo '  mdate    [-n] [-z] [-s] [-d] [-f<str>] [-o<spec>] <path>'
       echo '  table    [-F<sep>] [-w<width>] [-c<cols>] [-s<strip>] <str><sep><str>...'
       echo '  prop     [-p<str>]'
  -    echo '  move     [-e] [-p] <src-file> <dst-file>'
  -    echo '  install  [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>]'
  -    echo '           <file> <path>'
  -    echo '  mkdir    [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
  -    echo '  mkln     [-v] [-f] [-s] <src-path> [<src-path> ...] <dst-path>'
  -    echo '  mkshadow [-v] <src-dir> <dst-dir>'
  -    echo '  fixperm  [-v] <path> [<path> ...]'
  +    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> <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>'
  +    echo '  fixperm  [-v] [-t] <path> [<path> ...]'
  +    echo '  tarball  [-t] [-v] [-o <tarball>] [-c <prog>] [-d <dir>] [-u'
  +    echo '           <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]'
       echo '  guessos  '
  -    echo '  arx      [-v] [-C<cmd>] <op> <archive> <file> [<file> ...]'
  +    echo '  arx      [-t] [-C<cmd>] <op> <archive> [<file> ...]'
       echo '  slo      -- -L<dir> -l<lib> [ -L<dir> -l<lib> ... ]'
       echo '  scpp     [-v] [-p] [-o<ofile>] [-t<tfile>] [-M<mark>] [-D<dname>]'
       echo '           [-C<cname>] <file> [<file> ...]'
  @@ -94,11 +100,25 @@
       exit 0
   fi
   if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
  -    echo "shtool 1.3.0 (23-Jun-1999)"
  +    echo "GNU shtool 1.4.6 (05-Sep-1999)"
       exit 0
   fi
  -tool="$1"
  -shift
  +if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
  +    shift
  +    set -x
  +fi
  +name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'`
  +case "$name" in
  +    echo|mdate|table|prop|move|install|mkdir|mkln|mkshadow|fixperm|tarball|guessos|arx|slo|scpp|version|path )
  +        #   implicit tool command selection
  +        tool="$name"
  +        ;;
  +    * )
  +        #   explicit tool command selection
  +        tool="$1"
  +        shift
  +        ;;
  +esac
   arg_spec=""
   opt_spec=""
   gen_tmpfile=no
  @@ -140,40 +160,48 @@
           ;;
       move )
           str_tool="move"
  -        str_usage="[-e] [-p] <src-file> <dst-file>"
  +        str_usage="[-v] [-t] [-e] [-p] <src-file> <dst-file>"
           arg_spec="2"
  -        opt_spec="ep"
  +        opt_spec="vtep"
           ;;
       install )
           str_tool="install"
  -        str_usage="[-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
  +        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
           arg_spec="2"
  -        opt_spec="cCsm:o:g:e:"
  +        opt_spec="vtcCsm:o:g:e:"
           ;;
       mkdir )
           str_tool="mkdir"
  -        str_usage="[-f] [-p] [-m<mode>] <dir> [<dir> ...]"
  +        str_usage="[-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]"
           arg_spec="1+"
  -        opt_spec="fpm:"
  +        opt_spec="tfpm:"
           ;;
       mkln )
           str_tool="mkln"
  -        str_usage="[-v] [-f] [-s] <src-path> [<src-path> ...] <dst-path>"
  +        str_usage="[-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>"
           arg_spec="2+"
  -        opt_spec="vfs"
  +        opt_spec="tfs"
           ;;
       mkshadow )
           str_tool="mkshadow"
  -        str_usage="[-v] <src-dir> <dst-dir>"
  +        str_usage="[-v] [-t] [-a] <src-dir> <dst-dir>"
           arg_spec="2"
  -        opt_spec="v"
  +        opt_spec="vta"
           ;;
       fixperm )
           str_tool="fixperm"
  -        str_usage="[-v] <path> [<path> ...]"
  +        str_usage="[-v] [-t] <path> [<path> ...]"
  +        gen_tmpfile=yes
  +        arg_spec="1+"
  +        opt_spec="vt"
  +        ;;
  +    tarball )
  +        str_tool="tarball"
  +        str_usage="[-t] [-v] [-o <tarball>] [-c <prog>] [-d <dir>] [-u <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]"
           gen_tmpfile=yes
           arg_spec="1+"
  -        opt_spec="v"
  +        opt_spec="tvo:c:d:u:g:e:!"
  +        opt_e="CVS,\\.cvsignore,\\.[oa]\$"
           ;;
       guessos )
           str_tool="guessos"
  @@ -183,9 +211,9 @@
           ;;
       arx )
           str_tool="arx"
  -        str_usage="[-v] [-C<cmd>] <op> <archive> <file> [<file> ...]"
  -        arg_spec="3+"
  -        opt_spec="vC:!"
  +        str_usage="[-t] [-C<cmd>] <op> <archive> [<file> ...]"
  +        arg_spec="2+"
  +        opt_spec="tC:!"
           opt_C="ar"
           ;;
       slo )
  @@ -228,8 +256,8 @@
           opt_p="$PATH"
           ;;
       * )
  -        echo "$0:ERROR: unknown command \`$tool'" 2>&1
  -        echo "$0:HINT:  run \`$0 -h' for usage" 2>&1
  +        echo "$0:Error: unknown command \`$tool'" 2>&1
  +        echo "$0:Hint:  run \`$0 -h' for usage" 2>&1
           exit 1
           ;;
   esac
  @@ -242,10 +270,12 @@
   if [ ".$tool" != . ]; then
       #   inside shtool
       toolcmd="$0 $tool"
  +    toolcmdhelp="shtool $tool"
       msgprefix="shtool:$tool"
   else
       #   standalone
       toolcmd="$0"
  +    toolcmdhelp="sh.$tool"
       msgprefix="$str_tool"
   fi
   
  @@ -289,18 +319,18 @@
       else
           #   split argument into option and argument
           case "$1" in
  -            -[a-zA-Z0-9]*) 
  +            -[a-zA-Z0-9]*)
                   eval `echo "x$1" |\
                         sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \
                             -e 's/";\(.*\)$/"; opt_ARG="\1"/'`
                   ;;
  -            -[a-zA-Z0-9]) 
  +            -[a-zA-Z0-9])
                   opt_OPT=`awk 'BEGIN { printf("%s", substr(OPT, 2)); }' \
                            "OPT=$1" </dev/null"`
                   opt_ARG=''
                   ;;
  -            *) 
  -                break 
  +            *)
  +                break
                   ;;
           esac
       fi
  @@ -319,34 +349,34 @@
   
       #   process option
       case $opt_MODE in
  -        "." ) 
  +        "." )
               #   boolean option
               eval "opt_${opt_OPT}=yes"
               ;;
  -        ":" ) 
  +        ":" )
               #   option with argument (multiple occurances override)
  -            eval "opt_${opt_OPT}=\"\$opt_ARG\"" 
  +            eval "opt_${opt_OPT}=\"\$opt_ARG\""
               ;;
  -        "+" ) 
  -            #   option with argument (multiple occurances append) 
  -            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\"" 
  +        "+" )
  +            #   option with argument (multiple occurances append)
  +            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\""
               ;;
           * )
  -            echo "$msgprefix:ERROR: unknown option: \`-$opt_OPT'" 1>&2
  -            echo "$msgprefix:HINT:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
  +            echo "$msgprefix:Error: unknown option: \`-$opt_OPT'" 1>&2
  +            echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
               exit 1
               ;;
       esac
   done
   if [ ".$opt_PREV" != . ]; then
  -    echo "$msgprefix:ERROR: missing argument to option \`-$opt_PREV'" 1>&2
  -    echo "$msgprefix:HINT:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
  +    echo "$msgprefix:Error: missing argument to option \`-$opt_PREV'" 1>&2
  +    echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
       exit 1
   fi
   
   #   process help option
  -if [ .$opt_h = .yes ]; then
  -    echo "Usage: $toolcmd $str_usage"
  +if [ ".$opt_h" = .yes ]; then
  +    echo "Usage: $toolcmdhelp $str_usage"
       exit 0
   fi
   
  @@ -354,15 +384,15 @@
   case $arg_MODE in
       "=" )
           if [ $# -ne $arg_NUMS ]; then
  -            echo "$msgprefix:ERROR: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2
  -            echo "$msgprefix:HINT:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
  +            echo "$msgprefix:Error: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2
  +            echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
               exit 1
           fi
           ;;
       "+" )
           if [ $# -lt $arg_NUMS ]; then
  -            echo "$msgprefix:ERROR: invalid number of arguments (at least $arg_NUMS expected)" 1>&2
  -            echo "$msgprefix:HINT:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
  +            echo "$msgprefix:Error: invalid number of arguments (at least $arg_NUMS expected)" 1>&2
  +            echo "$msgprefix:Hint:  run \`$toolcmd -h' or \`man shtool' for details" 1>&2
               exit 1
           fi
           ;;
  @@ -408,6 +438,13 @@
           fi
       fi
       
  +    #   check for existing -n option (to suppress newline)
  +    minusn=''
  +    bytes=`echo -n 123 2>/dev/null | wc -c | awk '{ printf("%s", $1); }'`
  +    if [ ".$bytes" = .3 ]; then
  +        minusn='-n'
  +    fi
  +    
       #   determine terminal bold sequence
       term_bold='' 
       term_norm=''
  @@ -431,15 +468,15 @@
                       for seq in bold md smso; do # smso is last
                           bold="`$dir/$tool $seq 2>/dev/null`"
                           if [ ".$bold" != . ]; then
  -                            term_bold="$bold" 
  +                            term_bold="$bold"
                               break
                           fi
                       done
                       if [ ".$term_bold" != . ]; then
  -                        for seq in me rmso reset; do # reset is last
  +                        for seq in sgr0 me rmso reset; do # 'reset' is last
                               norm="`$dir/$tool $seq 2>/dev/null`"
                               if [ ".$norm" != . ]; then
  -                                term_norm="$norm" 
  +                                term_norm="$norm"
                                   break
                               fi
                           done
  @@ -577,27 +614,30 @@
       #   expand special ``%x'' constructs
       if [ ".$opt_e" = .yes ]; then
           text=`echo $seo "$text" |\
  -              sed -e "s;%B;${term_bold};g" \
  -                  -e "s;%b;${term_norm};g" \
  -                  -e "s;%u;${username};g" \
  -                  -e "s;%U;${userid};g" \
  -                  -e "s;%h;${hostname};g" \
  -                  -e "s;%d;${domainname};g" \
  -                  -e "s;%D;${time_day};g" \
  -                  -e "s;%M;${time_month};g" \
  -                  -e "s;%Y;${time_year};g" \
  -                  -e "s;%m;${time_monthname};g"`
  +              sed -e "s/%B/${term_bold}/g" \
  +                  -e "s/%b/${term_norm}/g" \
  +                  -e "s/%u/${username}/g" \
  +                  -e "s/%U/${userid}/g" \
  +                  -e "s/%h/${hostname}/g" \
  +                  -e "s/%d/${domainname}/g" \
  +                  -e "s/%D/${time_day}/g" \
  +                  -e "s/%M/${time_month}/g" \
  +                  -e "s/%Y/${time_year}/g" \
  +                  -e "s/%m/${time_monthname}/g" 2>/dev/null`
       fi
       
       #   create output
  -    echo dummy |\
  -    awk '{ 
  -        if (OPT_N == "yes")
  -            NL = "";
  +    if [ .$opt_n = .no ]; then
  +        echo $seo $text
  +    else
  +        #   the harder part: echo -n is best, because
  +        #   awk complains about some \xx sequences.
  +        if [ ".$minusn" != . ]; then
  +            echo $seo $minusn $text
           else
  -            NL = "\n";
  -        printf("%s%s", TEXT, NL); 
  -    }' TEXT="$text" OPT_N="$opt_n"
  +            echo dummy | awk '{ printf("%s", TEXT); }' TEXT="$text"
  +        fi
  +    fi
       ;;
   
   mdate )
  @@ -610,7 +650,7 @@
       
       fod="$1"
       case "$opt_o" in
  -        [dmy][dmy][dmy] ) 
  +        [dmy][dmy][dmy] )
               ;;
           * ) echo "$msgprefix:Error: invalid argument to option \`-o': $opt_o" 1>&2
               exit 1
  @@ -659,10 +699,10 @@
       day="$2"
       year="$3"
       
  -    #   We finally have to deal with the problem that the "ls" output 
  +    #   We finally have to deal with the problem that the "ls" output
       #   gives either the time of the day or the year.
       case $year in
  -        *:*) 
  +        *:*)
               this_year=`date '+%Y' 2>/dev/null`
               if [ ".$this_year" = . ]; then
                   this_year=`date '+%y'`
  @@ -671,7 +711,7 @@
                       [0-4][0-9]) this_year="20$this_year" ;;
                   esac
               fi
  -            #   for the following months of the last year the time notation 
  +            #   for the following months of the last year the time notation
               #   is usually also used for files modified in the last year.
               this_month=`date '+%m'`
               if (expr $nummonth \> $this_month) >/dev/null; then
  @@ -727,7 +767,7 @@
   
   table )
       ##
  -    ##  table -- Pretty print a field-sperarated list as a table
  +    ##  table -- Pretty print a field-separated list as a table
       ##  Copyright (c) 1998-1999 Ralf S. Engelschall <rse@engelschall.com>
       ##  Originally written for Apache
       ##
  @@ -738,7 +778,7 @@
       fi
       case "x$opt_F" in
           x? ) ;;
  -        *  ) echo "$msgprefix:Error: Invalid seperator (one char allowed only)" 1>&2; exit 1 ;;
  +        *  ) echo "$msgprefix:Error: Invalid separator (one char allowed only)" 1>&2; exit 1 ;;
       esac
       
       #   split the list into a table
  @@ -751,7 +791,7 @@
           done |\
           awk "
               BEGIN { list = \"\"; n = 0; }
  -            { 
  +            {
                   list = list \\$1;
                   n = n + 1;
                   if (n < $opt_c) {
  @@ -766,10 +806,11 @@
            "
       `
       
  -    #   format table cells and make sure table 
  +    #   format table cells and make sure table
       #   doesn't exceed maximum width
  +    OIFS="$IFS"
       IFS='
  -    '
  +'
       for entry in $list; do
           case $opt_c in
               1 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s\\n\", \$1); }'" ;;
  @@ -778,13 +819,14 @@
               4 ) eval "echo \"\${entry}\" | awk -F: '{ printf(\"%-${opt_w}s %-${opt_w}s %-${opt_w}s %-${opt_w}s\\n\", \$1, \$2, \$3, \$4); }'" ;;
           esac
       done |\
  -    awk "{ 
  -        if (length(\$0) > $opt_s) { 
  +    awk "{
  +        if (length(\$0) > $opt_s) {
               printf(\"%s\\n\", substr(\$0, 0, $opt_s-1));
  -        } else { 
  -            print \$0; 
  +        } else {
  +            print \$0;
           }
       }"
  +    IFS="$OIFS"
       ;;
   
   prop )
  @@ -805,11 +847,11 @@
           #   Perl is preferred because writing to STDERR in
           #   Perl really writes immediately as one would expect
           $perl -e '
  -            @p = ("|","/","-","\\"); 
  -            $i = 0; 
  -            while (<STDIN>) { 
  +            @p = ("|","/","-","\\");
  +            $i = 0;
  +            while (<STDIN>) {
                   printf(STDERR "\r%s...%s\b", $ARGV[0], $p[$i++]);
  -                $i = 0 if ($i > 3); 
  +                $i = 0 if ($i > 3);
               }
               printf(STDERR "\r%s    \n", $ARGV[0]);
           ' "$opt_p"
  @@ -817,18 +859,18 @@
           #   But when Perl doesn't exists we use Awk even
           #   some Awk's buffer even the /dev/stderr writing :-(
           awk '
  -            BEGIN { 
  +            BEGIN {
                   split("|#/#-#\\", p, "#");
  -                i = 1; 
  -            } 
  -            { 
  -                printf("\r%s%c\b", prefix, p[i++]) > "/dev/stderr"; 
  -                if (i > 4) { i = 1; } 
  +                i = 1;
               }
  +            {
  +                printf("\r%s%c\b", prefix, p[i++]) > "/dev/stderr";
  +                if (i > 4) { i = 1; }
  +            }
               END {
                   printf("\r%s    \n", prefix) > "/dev/stderr";
               }
  -        ' "prefix=$opt_p" 
  +        ' "prefix=$opt_p"
       fi
       ;;
   
  @@ -889,18 +931,33 @@
               onedst="$dst"
           fi
           errorstatus=0
  +        if [ ".$opt_v" = .yes ]; then
  +            echo "$onesrc -> $onedst"
  +        fi
           if [ ".$opt_p" = .yes ]; then
               if [ -r $onedst ]; then
                   if cmp -s $onesrc $onedst; then
  -                    rm -f $onesrc || errstatus=$?
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "rm -f $onesrc" 1>&2
  +                    fi
  +                    rm -f $onesrc || errorstatus=$?
                   else
  -                    mv -f $onesrc $onedst || errstatus=$?
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "mv -f $onesrc $onedst" 1>&2
  +                    fi
  +                    mv -f $onesrc $onedst || errorstatus=$?
                   fi
               else
  -                mv -f $onesrc $onedst || errstatus=$?
  +                if [ ".$opt_t" = .yes ]; then
  +                    echo "mv -f $onesrc $onedst" 1>&2
  +                fi
  +                mv -f $onesrc $onedst || errorstatus=$?
               fi
           else
  -                mv -f $onesrc $onedst || errstatus=$?
  +            if [ ".$opt_t" = .yes ]; then
  +                echo "mv -f $onesrc $onedst" 1>&2
  +            fi
  +            mv -f $onesrc $onedst || errorstatus=$?
           fi
           if [ $errorstatus -ne 0 ]; then
               break;
  @@ -921,7 +978,9 @@
       
       #  If destination is a directory, append the input filename
       if [ -d $dst ]; then
  -        dst="$dst/`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`"
  +        dst=`echo "$dst" | sed -e 's:/$::'`
  +        dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
  +        dst="$dst/$dstfile"
       fi
       
       #  Add a possible extension to src and dst
  @@ -930,32 +989,67 @@
           dst="$dst$opt_e"
       fi
       
  +    #  Check for correct arguments
  +    if [ ".$src" = ".$dst" ]; then
  +        echo "$msgprefix:Error: source and destination are the same" 1>&2
  +        exit 1
  +    fi
  +    
       #  Make a temp file name in the destination directory
  -    dstdir=`echo $dst | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
  -    dsttmp="$dstdir/#inst.$$#"
  +    dstdir=`echo $dst | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
  +    dsttmp="$dstdir/#INST@$$#"
       
  +    #  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)
  +    if [ ".$opt_C" = .yes ]; then
  +        opt_c=yes
  +    fi
       if [ ".$opt_c" = .yes ]; then
  -        cp $src $dsttmp
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "cp $src $dsttmp" 1>&2
  +        fi
  +        cp $src $dsttmp || exit $?
       else
  -        mv $src $dsttmp
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "mv $src $dsttmp" 1>&2
  +        fi
  +        mv $src $dsttmp || exit $?
       fi
       
  -    #  Set options; do chmod last to preserve setuid bits
  +    #  Adjust the target file
  +    #  (we do chmod last to preserve setuid bits)
       if [ ".$opt_s" = .yes ]; then
  -        strip $dsttmp
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "strip $dsttmp" 1>&2
  +        fi
  +        strip $dsttmp || exit $?
       fi
  -    if [ ".$opt_o" != . ]; then 
  -        chown $opt_o $dsttmp
  +    if [ ".$opt_o" != . ]; then
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "chown $opt_o $dsttmp" 1>&2
  +        fi
  +        chown $opt_o $dsttmp || exit $?
       fi
  -    if [ ".$opt_g" != . ]; then 
  -        chgrp $opt_g $dsttmp
  +    if [ ".$opt_g" != . ]; then
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "chgrp $opt_g $dsttmp" 1>&2
  +        fi
  +        chgrp $opt_g $dsttmp || exit $?
       fi
  -    if [ ".$opt_m" != . ]; then 
  -        chmod $opt_m $dsttmp
  +    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
  +    #   (has to be done _after_ the strip was already done)
       quick=no
       if [ ".$opt_C" = .yes ]; then
           if [ -r $dst ]; then
  @@ -967,15 +1061,20 @@
       
       #   Finally install the file to the real destination
       if [ $quick = yes ]; then
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "rm -f $dsttmp" 1>&2
  +        fi
           rm -f $dsttmp
       else
  -        rm -f $dst
  -        mv $dsttmp $dst
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "rm -f $dst && mv $dsttmp $dst" 1>&2
  +        fi
  +        rm -f $dst && mv $dsttmp $dst
       fi
       ;;
   
   mkdir )
  -    ## 
  +    ##
       ##  mkdir -- Make one or more directories
       ##  Copyright (c) 1996-1999 Ralf S. Engelschall <rse@engelschall.com>
       ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
  @@ -983,7 +1082,7 @@
       ##
       
       errstatus=0
  -    for p in ${1+"$@"}; do 
  +    for p in ${1+"$@"}; do
           #   when the directory already exists...
           if [ -d "$p" ]; then
               if [ ".$opt_f" = .no ]; then
  @@ -996,6 +1095,9 @@
           fi
           #   when the directory has to be created
           if [ ".$opt_p" = .no ]; then
  +            if [ ".$opt_t" = .yes ]; then
  +                echo "mkdir $p" 1>&2
  +            fi
               mkdir $p || errstatus=$?
           else
               #   the smart situation
  @@ -1012,8 +1114,14 @@
                       -* ) pathcomp="./$pathcomp" ;;
                   esac
                   if [ ! -d "$pathcomp" ]; then
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "mkdir $pathcomp" 1>&2
  +                    fi
                       mkdir $pathcomp || errstatus=$?
                       if [ ".$opt_m" != . ]; then
  +                        if [ ".$opt_t" = .yes ]; then
  +                            echo "chmod $opt_m $pathcomp" 1>&2
  +                        fi
                           chmod $opt_m $pathcomp || errstatus=$?
                       fi
                   fi
  @@ -1156,7 +1264,7 @@
           dstdir=`echo $dstdir | sed -e 's;\([^/]\)$;\1/;'`
       
           #   run the final link command
  -        if [ ".$opt_v" = .yes ]; then
  +        if [ ".$opt_t" = .yes ]; then
               echo "ln$lnopt $srcpre$srcdir$srcbase $dstpre$dstdir$dstbase"
           fi
           eval ln$lnopt $srcpre$srcdir$srcbase $dstpre$dstdir$dstbase
  @@ -1170,17 +1278,13 @@
       ##  Originally written for Apache
       ##
       
  -    #   default IFS
  -    DIFS=' 	
  -    '
  -    
       #   source and destination directory
       src=`echo "$1" | sed -e 's:/$::'`
       dst=`echo "$2" | sed -e 's:/$::'`
       
       #   check whether source exists
       if [ ! -d $src ]; then
  -        echo "$msgprefix:Error: source directory not found" 1>&2
  +        echo "$msgprefix:Error: source directory not found: \`$src'" 1>&2
           exit 1
       fi
       
  @@ -1209,34 +1313,39 @@
       
       #   create directory tree at destination
       if [ ! -d $dst ]; then
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "mkdir $dst" 1>&2
  +        fi
           mkdir $dst
       fi
  -    DIRS="`cd $src
  -           find . -type d -print |\
  -           sed -e '/\/CVS/d' \
  -               -e '/^\.$/d' \
  -               -e 's:^\./::'`"
  -    OIFS="$IFS" IFS="$DIFS"
  +    if [ ".$opt_a" = .yes ]; then
  +        DIRS=`cd $src; find . -type d -print |\
  +              sed -e '/^\.$/d' -e 's:^\./::'`
  +    else
  +        DIRS=`cd $src; find . -type d -print |\
  +              sed -e '/\/CVS/d' -e '/^\.$/d' -e 's:^\./::'`
  +    fi
       for dir in $DIRS; do
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "mkdir $dst/$dir" 1>&2
  +        fi
           mkdir $dst/$dir
       done
  -    IFS="$OIFS"
       
       #   fill directory tree with symlinks to files
  -    FILES="`cd $src
  -            find . -depth -print |\
  -            sed -e '/\.o$/d' \
  -                -e '/\.a$/d' \
  -                -e '/\.so$/d' \
  -                -e '/\.cvsignore$/d' \
  -                -e '/\/CVS/d' \
  -                -e '/\/\.#/d' \
  -                -e '/\.orig$/d' \
  -                -e 's/^\.\///'`"
  -    OIFS="$IFS" IFS="$DIFS"
  +    if [ ".$opt_a" = .yes ]; then
  +        FILES="`cd $src; find . -depth -print |\
  +                sed -e 's/^\.\///'`"
  +    else
  +        FILES="`cd $src; find . -depth -print |\
  +                sed -e '/\.o$/d' -e '/\.a$/d' -e '/\.so$/d' \
  +                    -e '/\.cvsignore$/d' -e '/\/CVS/d' \
  +                    -e '/\/\.#/d' -e '/\.orig$/d' \
  +                    -e 's/^\.\///'`"
  +    fi
       for file in $FILES; do
            #  don't use `-type f' above for find because of symlinks
  -         if [ -d $file ]; then
  +         if [ -d "$src/$file" ]; then
                continue
            fi
            basename=`echo $file | sed -e 's:^.*/::'`
  @@ -1248,11 +1357,11 @@
                    subdir=`echo $dir | sed -e 's:/$::'`
                    #   (inlined fp2rp)
                    revdir=''
  -                 OIFS2="$IFS"; IFS='/'
  +                 OIFS="$IFS"; IFS='/'
                    for pe in $subdir; do
                        revdir="../$revdir"
                    done
  -                 IFS="$OIFS2"
  +                 IFS="$OIFS"
                    #   finalize from
                    from="$revdir$from"
                fi
  @@ -1261,9 +1370,11 @@
            if [ ".$opt_v" = .yes ]; then
                echo "    $to" 1>&2
            fi
  +         if [ ".$opt_t" = .yes ]; then
  +             echo "ln -s $from $to" 1>&2
  +         fi
            ln -s $from $to
       done
  -    IFS="$OIFS"
       ;;
   
   fixperm )
  @@ -1295,31 +1406,210 @@
               if [ -f $file ]; then
                   if [ $minusx $file ]; then
                       if [ ".$opt_v" = .yes ]; then
  -                        echo "-rwxrwxr-x $file"
  +                        echo "-rwxrwxr-x $file" 2>&1
  +                    fi
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "chmod 775 $file" 2>&1
                       fi
                       chmod 775 $file
                   else
                       if [ ".$opt_v" = .yes ]; then
  -                        echo "-rw-rw-r-- $file"
  +                        echo "-rw-rw-r-- $file" 2>&1
                       fi
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "chmod 664 $file" 2>&1
  +                    fi
                       chmod 664 $file
                   fi
                   continue
               fi
               if [ -d $file ]; then
                   if [ ".$opt_v" = .yes ]; then
  -                    echo "drwxrwxr-x $file"
  +                    echo "drwxrwxr-x $file" 2>&1
  +                fi
  +                if [ ".$opt_t" = .yes ]; then
  +                    echo "chmod 775 $file" 2>&1
                   fi
                   chmod 775 $file
                   continue
               fi
               if [ ".$opt_v" = .yes ]; then
  -                echo "?????????? $file"
  +                echo "?????????? $file" 2>&1
               fi
           done
       done
       ;;
   
  +tarball )
  +    ##
  +    ##  tarball -- Roll distribution tarballs
  +    ##  Copyright (c) 1999 Ralf S. Engelschall <rse@engelschall.com>
  +    ##  Originally written for shtool
  +    ##
  +    
  +    srcs="$*"
  +    
  +    #   check whether the test command supports the -x option
  +    cat >$tmpfile <<EOT
  +if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
  +    exit 0
  +fi
  +exit 1
  +EOT
  +    if sh $tmpfile 2>/dev/null; then
  +        minusx="-x"
  +    else
  +        minusx="-r"
  +    fi
  +    rm -f $tmpfile
  +    
  +    #   find the tools
  +    paths="`echo $PATH |\
  +            sed -e 's%/*:%:%g' -e 's%/*$%%' \
  +                -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
  +                -e 's/:/ /g'`"
  +    for spec in find:gfind,find tar:gtar,tar tardy:tardy,tarcust; do
  +        prg=`echo $spec | sed -e 's/:.*$//'`
  +        tools=`echo $spec | sed -e 's/^.*://'`
  +        eval "prg_${prg}=''"
  +        #   iterate over tools
  +        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
  +                    eval "prg_${prg}=\"$path/$tool\""
  +                    break
  +                fi
  +            done
  +            eval "val=\$prg_${prg}"
  +            if [ ".$val" != . ]; then
  +                break
  +            fi
  +        done
  +    done
  +    
  +    #   expand source paths
  +    exclude=''
  +    for pat in `echo $opt_e | sed 's/,/ /g'`; do
  +        exclude="$exclude | grep -v '$pat'"
  +    done
  +    if [ ".$opt_t" = .yes ]; then
  +        echo "cp /dev/null $tmpfile.lst" 1>&2
  +    fi
  +    cp /dev/null $tmpfile.lst
  +    for src in $srcs; do
  +        if [ -d $src ]; then
  +            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) |\
  +            sed -e 's:^\.$::' -e 's:^\./::' | eval cat $exclude >>$tmpfile.lst
  +        else
  +            if [ ".$opt_t" = .yes ]; then
  +                echo "echo $src >>$tmpfile.lst" 1>&2
  +            fi
  +            echo $src >>$tmpfile.lst
  +        fi
  +    done
  +    sort <$tmpfile.lst >$tmpfile.lst.n
  +    mv $tmpfile.lst.n $tmpfile.lst
  +    if [ ".$opt_v" = .yes ]; then
  +        cat $tmpfile.lst | sed -e 's/^/  /' 1>&2
  +    fi
  +    
  +    #   determine tarball file and directory name
  +    if [ ".$opt_o" != . ]; then
  +        tarfile="$opt_o"
  +        if [ ".$opt_d" != . ]; then
  +            tarname="$opt_d"
  +        else
  +            tarname=`echo $tarfile | sed -e 's/\.tar.*$//' -e 's;.*/\([^/]*\)$;\1;'`
  +        fi
  +    else
  +        if [ ".$opt_d" != . ]; then
  +            tarname="$opt_d"
  +        elif [ -d "$from" ]; then
  +            tarname=`echo $from | sed -e 's;.*/\([^/]*\)$;\1;'`
  +        else
  +            tarname="out"
  +        fi
  +        tarfile="$tarname.tar"
  +    fi
  +    
  +    #   roll the tarball
  +    compress=''
  +    if [ ".$opt_c" != . ]; then
  +        compress="| $opt_c"
  +    fi
  +    if [ ".$prg_tardy" != . ]; then
  +        #   the elegant hackers way
  +        tardy_opt="--prefix=$tarname"
  +        tardy_opt="$tardy_opt --user_number=0 --group_number=0" # security!
  +        if [ ".$opt_u" != . ]; then
  +            tardy_opt="$tardy_opt --user_name=$opt_u"
  +        fi
  +        if [ ".$opt_g" != . ]; then
  +            tardy_opt="$tardy_opt --group_name=$opt_g"
  +        fi
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "cat $tmpfile.lst | xargs $prg_tar cf - | $prg_tardy $tardy_opt | cat $compress >$tmpfile.out" 1>&2
  +        fi
  +        cat $tmpfile.lst |\
  +        xargs $prg_tar cf - |\
  +        $prg_tardy $tardy_opt |\
  +        eval cat $compress >$tmpfile.out
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "cp $tmpfile.out $tarfile" 1>&2
  +        fi
  +        cp $tmpfile.out $tarfile
  +    else
  +        #  the portable standard way
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "mkdir $tmpdir/$tarname" 1>&2
  +        fi
  +        mkdir $tmpdir/$tarname || exit 1
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "cat $tmpfile.lst | xargs $prg_tar cf - | (cd $tmpdir/$tarname && $prg_tar xf -)" 1>&2
  +        fi
  +        cat $tmpfile.lst |\
  +        xargs $prg_tar cf - |\
  +        (cd $tmpdir/$tarname && $prg_tar xf -)
  +        if [ ".$opt_u" != . ]; then
  +            if [ ".$opt_t" = .yes ]; then
  +                echo "chown -R $opt_u $tmpdir/$tarname >/dev/null 2>&1" 2>&1
  +            fi
  +            chown -R $opt_u $tmpdir/$tarname >/dev/null 2>&1 ||\
  +            echo "$msgprefix:Warning: cannot set user name \`$opt_u' (need root priviledges)"
  +        fi
  +        if [ ".$opt_g" != . ]; then
  +            if [ ".$opt_t" = .yes ]; then
  +                echo "chgrp -R $opt_g $tmpdir/$tarname >/dev/null 2>&1" 2>&1
  +            fi
  +            chgrp -R $opt_g $tmpdir/$tarname >/dev/null 2>&1 ||\
  +            echo "$msgprefix:Warning: cannot set group name \`$opt_g' (need root priviledges)"
  +        fi
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "(cd $tmpdir && $prg_find $tarname -type f -depth -print | sort | xargs $prg_tar cf -) | cat $compress >$tmpfile.out" 1>&2
  +        fi
  +        (cd $tmpdir && $prg_find $tarname -type f -depth -print | sort | xargs $prg_tar cf -) |\
  +        eval cat $compress >$tmpfile.out
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "cp $tmpfile.out $tarfile" 1>&2
  +        fi
  +        cp $tmpfile.out $tarfile
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "rm -rf $tmpdir/$tarname" 1>&2
  +        fi
  +        rm -rf $tmpdir/$tarname
  +    fi
  +    
  +    #   cleanup
  +    if [ ".$opt_t" = .yes ]; then
  +        echo "rm -f $tmpfile.lst $tmpfile.out" 1>&2
  +    fi
  +    rm -f $tmpfile.lst $tmpfile.out
  +    ;;
  +
   guessos )
       ##
       ##  guessos -- Simple OS/platform guesser
  @@ -1341,11 +1631,11 @@
               esac
           else
           case "$XREL" in
  -            3.2v4.2) 
  -                echo "whatever-whatever-sco3"; exit 0 
  +            3.2v4.2)
  +                echo "whatever-whatever-sco3"; exit 0
                   ;;
  -            3.2v5.0*) 
  -                echo "whatever-whatever-sco5"; exit 0 
  +            3.2v5.0*)
  +                echo "whatever-whatever-sco5"; exit 0
                   ;;
               4.2MP)
                   if [ "x$VERSION" = "x2.1.1" ]; then
  @@ -1356,8 +1646,8 @@
                       echo "${MACHINE}-whatever-unixware2"; exit 0
                   fi
                   ;;
  -            4.2) 
  -                echo "whatever-whatever-unixware1"; exit 0 
  +            4.2)
  +                echo "whatever-whatever-unixware1"; exit 0
                   ;;
               5)
                   case "$VERSION" in
  @@ -1396,13 +1686,18 @@
               fi
               ;;
           IRIX64:*)
  -            echo "${MACHINE}-sgi-irix64"; exit 0
  -            ;;
  -        Linux:[2-9].*)
  -            echo "${MACHINE}-whatever-linux2"; exit 0
  +            echo "${MACHINE}/64-sgi-irix${RELEASE}"; exit 0
               ;;
  -        Linux:1.*)
  -            echo "${MACHINE}-whatever-linux1"; exit 0
  +        Linux:*)
  +            V='whatever'
  +            case "$MACHINE" in
  +                i?86) V='pc' ;;
  +            esac
  +            R=''
  +            case "$RELEASE" in
  +                [1-9].*) R=`echo $RELEASE | cut -c1` ;;
  +            esac
  +            echo "${MACHINE}-${V}-linux-gnu${R}"; exit 0
               ;;
           LynxOS:*)
               echo "${MACHINE}-lynx-lynxos"; exit 0
  @@ -1418,7 +1713,7 @@
               ;;
           FreeBSD:*)
               VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'`
  -            MACH=`sysctl -n hw.model`
  +            MACH=`/sbin/sysctl -n hw.model`
               ARCH='whatever'
               case ${MACH} in
                  *386*       ) MACH="i386"     ;;
  @@ -1535,6 +1830,9 @@
           *:*:*:"DRS 6000")
              echo "drs6000-whatever-whatever"; exit 0;
              ;;
  +        AmigaOS:*:*:* )
  +           echo "${MACHINE}-whatever-${SYSTEM}${RELEASE}"; exit 0
  +           ;;
       esac
       
       # Now NeXT
  @@ -1548,14 +1846,14 @@
                else
                    NEXTOS="nextstep"
                fi
  -             NEXTREL="`hostinfo | sed -n 's/.*NeXT Mach \([0-9\.]*\).*/\1/p'`" 
  +             NEXTREL="`hostinfo | sed -n 's/.*NeXT Mach \([0-9\.]*\).*/\1/p'`"
                NEXTARCH=`arch`
                echo "${NEXTARCH}-next-${NEXTOS}${NEXTREL}" ; exit 0
                ;;
       esac
       
       # Fallback
  -    echo "${MACHINE}-whatever-${SYSTEM}|${RELEASE}|${VERSION}"
  +    echo "${MACHINE}-whatever-${SYSTEM}/${RELEASE}/${VERSION}"
       ;;
   
   arx )
  @@ -1565,7 +1863,7 @@
       ##  Originally written for shtool
       ##
       
  -    ar_prg="$opt_C"; shift
  +    ar_prg="$opt_C"
       ar_cmd="$1"; shift
       archive="$1"; shift
       files="$*"
  @@ -1573,51 +1871,53 @@
       #   walk through the file list and expand archives members
       tmpdir=`echo $archive | sed -e 's;[^/]*$;.arx;'`
       nfiles=''
  -    for file in $files; do
  -        if [ ! -f $file ]; then
  -            echo "$msgprefix:Error: input file not found: $file" 1>&2
  -            exit 1
  -        fi
  -        case $file in
  -            *.a ) 
  -                if [ ! -d $tmpdir ]; then
  -                    if [ ".$opt_v" = .yes ]; then
  -                        echo "mkdir $tmpdir"
  +    if [ ".$files" != . ]; then
  +        for file in $files; do
  +            if [ ! -f $file ]; then
  +                echo "$msgprefix:Error: input file not found: $file" 1>&2
  +                exit 1
  +            fi
  +            case $file in
  +                *.a )
  +                    if [ ! -d $tmpdir ]; then
  +                        if [ ".$opt_t" = .yes ]; then
  +                            echo "mkdir $tmpdir" 1>&2
  +                        fi
  +                        mkdir $tmpdir
                       fi
  -                    mkdir $tmpdir
  -                fi
  -                case $tmpdir in
  -                     .arx ) 
  -                         from="../$file"
  -                         ;;
  -                     * )
  -                         dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
  -                         base=`echo $file | sed -e 's;.*/\([^/]*\)$;\1;'`
  -                         from="`cd $dir; pwd`/$base"
  -                         ;;
  -                esac
  -                if [ ".$opt_v" = .yes ]; then
  -                    echo "(cd $tmpdir && $ar_prg x $from)"
  -                fi
  -                (cd $tmpdir && eval $ar_prg x $from)
  -                if [ $? -ne 0 ]; then
  -                    echo "$msgprefix:Error: member extraction failed for archive: $file" 1>&2
  -                    exit 1
  -                fi
  -                for member in - `eval $ar_prg t $file`; do
  -                    [ ".$member" = .- ] && continue
  -                    nfiles="$nfiles $tmpdir/$member"
  -                done
  -                ;;
  -            * )
  -                nfiles="$nfiles $file"
  -                ;;
  -        esac
  -    done
  +                    case $tmpdir in
  +                         .arx )
  +                             from="../$file"
  +                             ;;
  +                         * )
  +                             dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
  +                             base=`echo $file | sed -e 's;.*/\([^/]*\)$;\1;'`
  +                             from="`cd $dir; pwd`/$base"
  +                             ;;
  +                    esac
  +                    if [ ".$opt_t" = .yes ]; then
  +                        echo "(cd $tmpdir && $ar_prg x $from)" 1>&2
  +                    fi
  +                    (cd $tmpdir && eval $ar_prg x $from)
  +                    if [ $? -ne 0 ]; then
  +                        echo "$msgprefix:Error: member extraction failed for archive: $file" 1>&2
  +                        exit 1
  +                    fi
  +                    for member in - `eval $ar_prg t $file`; do
  +                        [ ".$member" = .- ] && continue
  +                        nfiles="$nfiles $tmpdir/$member"
  +                    done
  +                    ;;
  +                * )
  +                    nfiles="$nfiles $file"
  +                    ;;
  +            esac
  +        done
  +    fi
       
       #   run the final archive command
  -    if [ ".$opt_v" = .yes ]; then
  -        echo "$ar_prg $ar_cmd $archive $nfiles"
  +    if [ ".$opt_t" = .yes ]; then
  +        echo "$ar_prg $ar_cmd $archive $nfiles" 1>&2
       fi
       eval $ar_prg $ar_cmd $archive $nfiles
       if [ $? -ne 0 ]; then
  @@ -1627,8 +1927,8 @@
       
       #   cleanup and die gracefully
       if [ -d $tmpdir ]; then
  -        if [ ".$opt_v" = .yes ]; then
  -            echo "rm -rf $tmpdir"
  +        if [ ".$opt_t" = .yes ]; then
  +            echo "rm -rf $tmpdir" 1>&2
           fi
           rm -rf $tmpdir
       fi
  @@ -1641,15 +1941,13 @@
       ##  Originally written for Apache
       ##
       
  -    DIFS=' 	
  -    '
  +    DIFS="$IFS"
       
       #   parse out -L and -l options from command line
       DIRS=''
       LIBS=''
       ARGV=''
  -    optprev=""
  -    OIFS="$IFS" IFS="$DIFS"
  +    optprev=''
       for opt
       do
           #   concatenate with previous option if exists
  @@ -1672,7 +1970,6 @@
                *) ARGV="$ARGV $opt" ;;
           esac
       done
  -    IFS="$OIFS"
       
       #   set linker default directories
       DIRS_DEFAULT='/lib:/usr/lib'
  @@ -1712,17 +2009,17 @@
                    case $file in
                        *.so|*.so.[0-9]*|*.sl|*.sl.[0-9]* )
                             found=yes;
  -                          found_type=DSO; 
  -                          break 
  +                          found_type=DSO;
  +                          break
                             ;;
                        *.lo|*.la )
                             found=yes;
  -                          found_type=PIC 
  +                          found_type=PIC
                             ;;
                        *.a )
                             if [ ".$found_type" = . ]; then
                                 found=yes
  -                              found_type=OBJ 
  +                              found_type=OBJ
                             fi
                             ;;
                    esac
  @@ -1764,10 +2061,9 @@
       done
       IFS="$OIFS"
       
  -    #   reassemble the options but seperated by type
  -    OIFS="$IFS" IFS="$DIFS"
  +    #   reassemble the options but separated by type
       for type in OBJ PIC DSO; do
  -        OIFS2="$IFS" IFS=':'
  +        OIFS="$IFS" IFS=':'
           eval "libs=\"\$LIBS_${type}\""
           opts=''
           for lib in $libs; do
  @@ -1783,67 +2079,86 @@
               opts="$opts -L$dir"
           done
           eval "DIRS_${type}=\"$opts\""
  -        IFS="$OIFS2"
  +        IFS="$OIFS"
       done
  -    IFS="$OIFS"
       
       #   give back results
  -    OIFS="$IFS" IFS="$DIFS"
       for var in ARGV DIRS_OBJ LIBS_OBJ DIRS_PIC LIBS_PIC DIRS_DSO LIBS_DSO; do
           eval "val=\"\$${var}\""
           val="`echo $val | sed -e 's/^ *//'`"
           echo "SLO_${var}=\"${val}\""
       done
  -    IFS="$OIFS"
       ;;
   
   scpp )
       ##
       ##  scpp -- Sharing C Pre-Processor
       ##  Copyright (c) 1999 Ralf S. Engelschall <rse@engelschall.com>
  -    ##  Originally written for NPS
  +    ##  Originally written for GNU pth
       ##
       
       srcs="$*"
       output="${opt_o}.n"
       
  +    #   find a reasonable Awk
  +    awk=''
  +    paths=`echo $PATH |\
  +           sed -e 's%/*:%:%g' -e 's%/$%%' \
  +               -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
  +               -e 's/:/ /g'`
  +    for name in gawk nawk awk; do
  +        for path in $paths; do
  +            if [ -r "$path/$name" ]; then
  +                awk="$path/$name"
  +                break
  +            fi
  +        done
  +        if [ ".$awk" != . ]; then
  +            break
  +        fi
  +    done
  +    if [ ".$awk" = . ]; then
  +        echo "$msgprefix:Error: cannot find a reasonable Awk" 1>&2
  +        exit 1
  +    fi
  +    
       #   parse source file(s)
       if [ ".$opt_v" = .yes ]; then
  -        echo "Parsing:" | awk '{ printf("%s", $0); }' 1>&2
  +        echo "Parsing:" | $awk '{ printf("%s", $0); }' 1>&2
       fi
       for src in $srcs; do
           if [ ".$opt_v" = .yes ]; then
  -            echo $src | awk '{ printf(" %s", $0); }' 1>&2
  +            echo $src | $awk '{ printf(" %s", $0); }' 1>&2
           fi
  -        awk <$src '
  +        $awk <$src '
              BEGIN {
                  ln    = 0;
                  fln   = 0;
                  level = 0;
                  mode  = "";
  -               store = ""; 
  +               store = "";
              }
              {
                  ln++;
              }
  -           /^#if.*/ { 
  +           /^#if.*/ {
                  level++;
              }
  -           /^#if [a-zA-Z_][a-zA-Z0-9_]* *$/ { 
  +           /^#if [a-zA-Z_][a-zA-Z0-9_]* *$/ {
                  if ($2 == define) {
                      mode = "D";
                      printf("D:#line %d \"%s\"\n", ln, src);
                      next;
                  }
              }
  -           /^#endif.*/ { 
  +           /^#endif.*/ {
                  level--;
                  if (mode == "D" && level == 0) {
                      mode = "";
                      next;
                  }
              }
  -           /^[a-zA-Z_][a-zA-Z0-9_].*;.*/ || /^[a-zA-Z_][a-zA-Z0-9_].*=.*/ { 
  +           /^[a-zA-Z_][a-zA-Z0-9_].*;.*/ {
                  if ($1 == class) {
                      printf("V:#line %d \"%s\"\n", ln, src);
                      printf("V:%s\n", $0);
  @@ -1851,15 +2166,23 @@
                      next;
                  }
              }
  -           /^[a-zA-Z_][a-zA-Z0-9_]*/ { 
  +           /^[a-zA-Z_][a-zA-Z0-9_].*=.*/ {
                  if ($1 == class) {
  +                   printf("V:#line %d \"%s\"\n", ln, src);
  +                   printf("V:%s\n", $0);
  +                   printf("J:%s\n", $0);
  +                   next;
  +               }
  +           }
  +           /^[a-zA-Z_][a-zA-Z0-9_]*/ {
  +               if ($1 == class) {
                      fln = ln;
                      store = $0;
                      mode = "F";
                      next;
                  }
              }
  -           /^\{ *$/ { 
  +           /^\{ *$/ {
                  if (mode == "F") {
                      printf("F:#line %d \"%s\"\n", fln, src);
                      printf("F:%s;\n", store);
  @@ -1888,7 +2211,7 @@
       sed -e "/^${opt_M} *\$/d" >>$output
       
       #   merge in the define blocks
  -    grep '^D:' $tmpfile | sed -e 's/^D://' >>$output 
  +    grep '^D:' $tmpfile | sed -e 's/^D://' >>$output
       
       #   generate standard prolog
       echo "#line 1 \"_ON_THE_FLY_\"" >>$output
  @@ -1910,7 +2233,7 @@
       
       #   generate namespace hiding for functions
       echo "" >>$output
  -    echo "/* move intern function to hidden namespace */" >>$output
  +    echo "/* move intern functions to hidden namespace */" >>$output
       grep '^I:' $tmpfile | sed >>$output \
           -e 's/^I://' \
           -e 's/\([ (]\) */\1/g' \
  @@ -1937,6 +2260,11 @@
           -e 's/^F://' \
           -e 's/\([ (]\) */\1/g' \
           -e 's/ *\([),]\)/\1/g' \
  +        -e 's/\([* ]\)[a-zA-Z0-9_]*,/\1,/g' \
  +        -e 's/\([* ]\)[a-zA-Z0-9_]*);/\1);/g' \
  +        -e 's/(\*[a-zA-Z0-9_]*)(/(*)(/g' \
  +        -e 's/\([ (]\) */\1/g' \
  +        -e 's/ *\([),]\)/\1/g' \
           -e "s/^$opt_C /extern /"
       
       #   finish generating output header
  @@ -2040,10 +2368,12 @@
                           bptype=p
                           ;;
                       r ) revision=`expr $revision + 1`
  +                        bptype=.
                           bplevel=0
                           ;;
                       v ) version=`expr $version + 1`
                           revision=0
  +                        bptype=.
                           bplevel=0
                           ;;
                   esac
  @@ -2150,7 +2480,7 @@
           exit 0
       fi
       
  -    #   create the version file according the the selected language  
  +    #   create the version file according the the selected language
       echo "new version: $version.$revision$bptype$bplevel ($date)"
       case $LANGUAGE in
           txt )
  @@ -2188,7 +2518,7 @@
   const char @PREFIX@_Hello[]      = "This is @NAME@, Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
   const char @PREFIX@_GNUVersion[] = "@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   const char @PREFIX@_WhatID[]     = "@(#)@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
  -const char @PREFIX@_RCSIdentID[] = "$Id: shtool,v 1.1 1999/08/17 15:59:45 rbb Exp $";
  +const char @PREFIX@_RCSIdentID[] = "$Id: shtool,v 1.2 1999/09/27 07:42:10 rse Exp $";
   const char @PREFIX@_WebID[]      = "@NAME@/@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   const char @PREFIX@_PlainID[]    = "@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   
  @@ -2207,7 +2537,7 @@
   $@PREFIX@_Hello      = "This is @NAME@, Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
   $@PREFIX@_GNUVersion = "@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   $@PREFIX@_WhatID     = "@(#)@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
  -$@PREFIX@_RCSIdentID = "\$Id: shtool,v 1.1 1999/08/17 15:59:45 rbb Exp $/";
  +$@PREFIX@_RCSIdentID = "\$Id: shtool,v 1.2 1999/09/27 07:42:10 rse Exp $/";
   $@PREFIX@_WebID      = "@NAME@/@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   $@PREFIX@_PlainID    = "@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   
  @@ -2303,7 +2633,7 @@
           for dir in $paths; do
               dir=`echo $dir | sed -e 's;/*$;;'`
               for perl in perl5 perl miniperl; do
  -                 if [ $minusx "$dir/$perl" ]; then
  +                 if [ $minusx "$dir/$perl" ] && [ ! -d "$dir/$perl" ]; then
                        perl="$dir/$perl"
                        version=`$perl -v | grep version |\
                                 sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
  
  
  

Mime
View raw message