Changeset 3765

Timestamp:

Apr 22, 2005, 4:07:27 PM (21 years ago)

Author:

desonia

Message:

fixed problem that broke Linux.

Location:

trunk/psLib

Files:

• config.guess (modified) (27 diffs)
• config.sub (modified) (35 diffs)
• configure.ac (modified) (7 diffs)
• ltmain.sh (modified) (188 diffs)
• src/collections/psMetadata.c (modified) (2 diffs)
• src/types/psMetadata.c (modified) (2 diffs)

trunk/psLib/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-02-22'
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+timestamp='2004-08-11'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -54 +54 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
@@ -107 +107 @@
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
@@ -135 +136 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_MACHINE}" in
+    i?86)
+        test -z "$VENDOR" && VENDOR=pc
+        ;;
+    *)
+        test -z "$VENDOR" && VENDOR=unknown
+        ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 
 # Note: order is significant - the case branches are not exclusive.
@@ -197 +208 @@
         echo "${machine}-${os}${release}"
         exit 0 ;;
+    amd64:OpenBSD:*:*)
+        echo x86_64-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     amiga:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -203 +217 @@
         echo mipsel-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    cats:OpenBSD:*:*)
+        echo arm-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     hp300:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    luna88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     mac68k:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -236 +256 @@
         echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
+    *:ekkoBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+        exit 0 ;;
+    macppc:MirBSD:*:*)
+        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+        exit 0 ;;
+    *:MirBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+        exit 0 ;;
     alpha:OSF1:*:*)
-        if test $UNAME_RELEASE = "V4.0"; then
+        case $UNAME_RELEASE in
+        *4.0)
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-        fi
+                ;;
+        *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
         # According to Compaq, /usr/sbin/psrinfo has been available on
         # OSF/1 and Tru64 systems produced since 1995.  I hope that
@@ -277 +311 @@
                 UNAME_MACHINE="alphaev79" ;;
         esac
+        # A Pn.n version is a patched version.
         # A Vn.n version is a released version.
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -303 +338 @@
     *:OS/390:*:*)
         echo i370-ibm-openedition
+        exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
         exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
@@ -321 +359 @@
         echo pyramid-pyramid-svr4
         exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+        echo sparc-icl-nx6
+        exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
         case `/usr/bin/uname -p` in
@@ -393 +434 @@
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+        echo m68k-apple-machten${UNAME_RELEASE}
+        exit 0 ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
@@ -728 +772 @@
         exit 0 ;;
     *:UNICOS/mp:*:*)
-        echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
         exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
@@ -736 +780 @@
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -746 +795 @@
         exit 0 ;;
     *:FreeBSD:*:*)
-        # Determine whether the default compiler uses glibc.
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #include <features.h>
-        #if __GLIBC__ >= 2
-        LIBC=gnu
-        #else
-        LIBC=
-        #endif
-EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
         exit 0 ;;
     i*:CYGWIN*:*)
@@ -768 +806 @@
         echo ${UNAME_MACHINE}-pc-pw32
         exit 0 ;;
-    x86:Interix*:3*)
-        echo i586-pc-interix3
+    x86:Interix*:[34]*)
+        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
         exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -790 +828 @@
         exit 0 ;;
     *:GNU:*:*)
+        # the GNU system
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        exit 0 ;;
+    *:GNU/*:*:*)
+        # other systems with GNU libc and userland
+        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
         exit 0 ;;
     i*86:Minix:*:*)
@@ -796 +839 @@
         exit 0 ;;
     arm*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
+        exit 0 ;;
+    cris:Linux:*:*)
+        echo cris-axis-linux
         exit 0 ;;
     ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
+        exit 0 ;;
+    m32r*:Linux:*:*)
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
         exit 0 ;;
     m68*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
         exit 0 ;;
     mips:Linux:*:*)
@@ -821 +870 @@
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
         ;;
     mips64:Linux:*:*)
@@ -840 +889 @@
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+        test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
         ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
+        echo powerpc-${VENDOR}-linux
         exit 0 ;;
     ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
+        echo powerpc64-${VENDOR}-linux
         exit 0 ;;
     alpha:Linux:*:*)
@@ -859 +908 @@
         esac
         objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+        echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
         exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-          PA7*) echo hppa1.1-unknown-linux-gnu ;;
-          PA8*) echo hppa2.0-unknown-linux-gnu ;;
-          *)    echo hppa-unknown-linux-gnu ;;
+          PA7*) echo hppa1.1-${VENDOR}-linux ;;
+          PA8*) echo hppa2.0-${VENDOR}-linux ;;
+          *)    echo hppa-${VENDOR}-linux ;;
         esac
         exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
+        echo hppa64-${VENDOR}-linux
         exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
         echo ${UNAME_MACHINE}-ibm-linux
         exit 0 ;;
+    sh64*:Linux:*:*)
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
+        exit 0 ;;
     sh*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
         exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-${VENDOR}-linux
         exit 0 ;;
     x86_64:Linux:*:*)
-        echo x86_64-unknown-linux-gnu
+        echo x86_64-${VENDOR}-linux
         exit 0 ;;
     i*86:Linux:*:*)
@@ -898 +950 @@
         case "$ld_supported_targets" in
           elf32-i386)
-                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+                TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
                 ;;
           a.out-i386-linux)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+                echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
                 exit 0 ;;
           coff-i386)
-                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
                 exit 0 ;;
           "")
-                # Either a pre-BFD a.out linker (linux-gnuoldld) or
+                # Either a pre-BFD a.out linker (linuxoldld) or
                 # one that does not give us useful --help.
-                echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+                echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
                 exit 0 ;;
         esac
@@ -933 +985 @@
         #endif
         #endif
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
 EOF
         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
         test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
         ;;
@@ -962 +1017 @@
     i*86:atheos:*:*)
         echo ${UNAME_MACHINE}-unknown-atheos
+        exit 0 ;;
+        i*86:syllable:*:*)
+        echo ${UNAME_MACHINE}-pc-syllable
         exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
@@ -1032 +1090 @@
         echo m68k-diab-dnix
         exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
@@ -1132 +1190 @@
         exit 0 ;;
     *:Darwin:*:*)
-        case `uname -p` in
+        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+        case $UNAME_PROCESSOR in
             *86) UNAME_PROCESSOR=i686 ;;
-            powerpc) UNAME_PROCESSOR=powerpc ;;
+            unknown) UNAME_PROCESSOR=powerpc ;;
         esac
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1149 +1208 @@
         echo i386-pc-qnx
         exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
         exit 0 ;;
@@ -1190 +1249 @@
         echo pdp10-unknown-its
         exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+        exit 0 ;;
+    *:DragonFly:*:*)
+        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        exit 0 ;;
+    *:*VMS:*:*)
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        case "${UNAME_MACHINE}" in
+            A*) echo alpha-dec-vms && exit 0 ;;
+            I*) echo ia64-dec-vms && exit 0 ;;
+            V*) echo vax-dec-vms && exit 0 ;;
+        esac
 esac
 

trunk/psLib/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-02-22'
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+timestamp='2004-06-24'
 
 # This file is (in principle) common to ALL GNU software.
@@ -71 +71 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
@@ -119 +119 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -145 +146 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis)
+        -apple | -axis | -knuth | -cray)
                 os=
                 basic_machine=$1
@@ -229 +230 @@
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-        | clipper \
+        | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
         | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
-        | ip2k \
-        | m32r | m68000 | m68k | m88k | mcore \
+        | ip2k | iq2000 \
+        | m32r | m32rle | m68000 | m68k | m88k | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
@@ -248 +250 @@
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
         | mipsisa64sb1 | mipsisa64sb1el \
         | mipsisa64sr71k | mipsisa64sr71kel \
@@ -260 +263 @@
         | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
         | strongarm \
-        | tahoe | thumb | tic80 | tron \
+        | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
@@ -298 +301 @@
         | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | cydra-* \
+        | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
@@ -305 +308 @@
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* \
-        | m32r-* \
+        | ip2k-* | iq2000-* \
+        | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
         | m88110-* | m88k-* | mcore-* \
@@ -320 +323 @@
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
+        | mmix-* \
         | msp430-* \
-        | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -333 +338 @@
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
         | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -360 +365 @@
                 os=-udi
                 ;;
+        abacus)
+                basic_machine=abacus-unknown
+                ;;
         adobe68k)
                 basic_machine=m68010-adobe
@@ -374 +382 @@
                 os=-bsd
                 ;;
+        amd64)
+                basic_machine=x86_64-pc
+                ;;
+        amd64-*)
+                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -433 +447 @@
                 os=-unicos
                 ;;
+        craynv)
+                basic_machine=craynv-cray
+                os=-unicosmp
+                ;;
+        cr16c)
+                basic_machine=cr16c-unknown
+                os=-elf
+                ;;
         crds | unos)
                 basic_machine=m68k-crds
@@ -438 +460 @@
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
+                ;;
+        crx)
+                basic_machine=crx-unknown
+                os=-elf
                 ;;
         da30 | da30-*)
@@ -638 +664 @@
         mips3*)
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-                ;;
-        mmix*)
-                basic_machine=mmix-knuth
-                os=-mmixware
                 ;;
         monitor)
@@ -723 +745 @@
                 basic_machine=np1-gould
                 ;;
-        nv1)
-                basic_machine=nv1-cray
-                os=-unicosmp
-                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
@@ -738 +756 @@
                 os=-coff
                 ;;
+        os400)
+                basic_machine=powerpc-ibm
+                os=-os400
+                ;;
         OSE68000 | ose68000)
                 basic_machine=m68000-ericsson
@@ -769 +791 @@
                 basic_machine=i686-pc
                 ;;
-        pentiumii | pentium2)
+        pentiumii | pentium2 | pentiumiii | pentium3)
                 basic_machine=i686-pc
+                ;;
+        pentium4)
+                basic_machine=i786-pc
                 ;;
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
@@ -778 +803 @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-*)
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        pentium4-*)
+                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -839 +867 @@
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
+        sei)
+                basic_machine=mips-sei
+                os=-seiux
+                ;;
         sequent)
                 basic_machine=i386-sequent
@@ -846 +878 @@
                 os=-hms
                 ;;
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
         sparclite-wrs | simso-wrs)
                 basic_machine=sparclite-wrs
@@ -920 +955 @@
                 os=-unicos
                 ;;
-        tic4x | c4x*)
-                basic_machine=tic4x-unknown
-                os=-coff
-                ;;
         tic54x | c54x*)
                 basic_machine=tic54x-unknown
@@ -948 +979 @@
         tower | tower-32)
                 basic_machine=m68k-ncr
+                ;;
+        tpf)
+                basic_machine=s390x-ibm
+                os=-tpf
                 ;;
         udi29k)
@@ -1022 +1057 @@
                 basic_machine=romp-ibm
                 ;;
+        mmix)
+                basic_machine=mmix-knuth
+                ;;
         rs6000)
                 basic_machine=rs6000-ibm
@@ -1044 +1082 @@
                 basic_machine=sh64-unknown
                 ;;
-        sparc | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
@@ -1117 +1155 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1129 +1168 @@
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix*)
+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1153 +1192 @@
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        -linux*)
-                os=`echo $os | sed -e 's|linux|linux-gnu|'`
+        -linux-dietlibc)
+                os=-linux-dietlibc
                 ;;
         -sunos5*)
@@ -1165 +1204 @@
                 os=-openedition
                 ;;
+        -os400*)
+                os=-os400
+                ;;
         -wince*)
                 os=-wince
@@ -1185 +1227 @@
         -atheos*)
                 os=-atheos
+                ;;
+        -syllable*)
+                os=-syllable
                 ;;
         -386bsd)
@@ -1207 +1252 @@
         -sinix*)
                 os=-sysv4
+                ;;
+        -tpf*)
+                os=-tpf
                 ;;
         -triton*)
@@ -1275 +1323 @@
                 os=-aout
                 ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
         # This must come before the *-dec entry.
         pdp10-*)
@@ -1320 +1371 @@
         *-ibm)
                 os=-aix
+                ;;
+        *-knuth)
+                os=-mmixware
                 ;;
         *-wec)
@@ -1453 +1507 @@
                                 vendor=ibm
                                 ;;
+                        -os400*)
+                                vendor=ibm
+                                ;;
                         -ptx*)
                                 vendor=sequent
+                                ;;
+                        -tpf*)
+                                vendor=ibm
                                 ;;
                         -vxsim* | -vxworks* | -windiss*)

trunk/psLib/configure.ac

@@ -1 @@
-AC_INIT([pslib],[0.6],[www.pan-starrs.org/bugzilla])
+AC_INIT([pslib],[0.6],[http://www.pan-starrs.org/bugzilla])
 AC_CANONICAL_TARGET
 AM_CONFIG_HEADER(src/config.h)
-AM_INIT_AUTOMAKE(0.6)
+AM_INIT_AUTOMAKE(1.6)
 
 PSLIB_LT_VERSION="0:5:0"
@@ -24 +24 @@
   *-apple-darwin*)
     CFLAGS="${CFLAGS=} -Wno-long-double"
-    AC_CHECK_LIB(g2c,main,[FLIBS="${FLIBS} -lg2c"])
+    FLIBS="${FLIBS} -lg2c"
     ;;
 esac
@@ -59 +59 @@
 dnl MYSQL_LDFLAGS="-L${libdir}/mysql"
 dnl MYSQL_CFLAGS="-I${includedir}/mysql"
-AC_ARG_ENABLE(mysql, 
+AC_ARG_ENABLE(mysql,
  [AC_HELP_STRING([--disable-mysql],[Disable MySQL functionality])],
  [MYSQL_REQ=$enableval],
@@ -84 +84 @@
   PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"
   AC_SUBST(TST_PSDB,"tst_psDB") dnl enable the test for psDB
-  
+
   AC_RUN_IFELSE([AC_LANG_PROGRAM(
 [[#include <stdlib.h>
@@ -151 +151 @@
 dnl LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
-   
+
 dnl ------------------- XML2 options ---------------------
 AC_ARG_WITH(xml2-config,
@@ -167 +167 @@
 
 dnl ------------------- SWIG options ---------------------
-AC_ARG_ENABLE(perlmodule, 
+AC_ARG_ENABLE(perlmodule,
  [AC_HELP_STRING([--disable-perlmodule],[Disable creation of perl module])],
  [SWIG_REQ="$enableval"],
@@ -235 +235 @@
 AC_CONFIG_FILES([ src/sysUtils/Makefile ])
 
-if test "$SWIG_REQ" == "yes" 
+if test "$SWIG_REQ" == "yes"
 then
   AC_CONFIG_FILES([ swig/Makefile ])

trunk/psLib/ltmain.sh

@@ -2 +2 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -25 +25 @@
 # the same distribution terms that you use for the rest of that program.
 
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.8
+TIMESTAMP=" (1.1220.2.118 2004/08/07 12:24:38)"
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
+  setopt NO_GLOB_SUBST
+fi
+
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -37 +65 @@
 else
   # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
 fi
 
@@ -46 +74 @@
 $*
 EOF
-  exit 0
+  exit $EXIT_SUCCESS
 fi
-
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5
-TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
 
 default_mode=
@@ -71 +89 @@
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 # test EBCDIC or ASCII
-case `echo A|od -x` in
- *[Cc]1*) # EBCDIC based system
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
   SP2NL="tr '\100' '\n'"
   NL2SP="tr '\r\n' '\100\100'"
@@ -95 +113 @@
 
 # Make sure IFS has a sensible default
-: ${IFS="       "}
+: ${IFS="       
+"}
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   $echo "$modename: not configured to build any kind of library" 1>&2
   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
@@ -119 +138 @@
 # This seems to be the best place for them
 
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid () {
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
@@ -131 +153 @@
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
         sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
@@ -141 +163 @@
     fi
     ;;
-  *DLL*) 
+  *DLL*)
     win32_libid_type="x86 DLL"
     ;;
@@ -155 +177 @@
 }
 
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        case $arg in
+          *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+          arg="\"$arg\""
+          ;;
+        esac
+        CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+        for z in $available_tags; do
+          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+            # Evaluate the configuration.
+            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+            CC_quoted=
+            for arg in $CC; do
+            # Double-quote args containing other shell metacharacters.
+            case $arg in
+              *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
+              arg="\"$arg\""
+              ;;
+            esac
+            CC_quoted="$CC_quoted $arg"
+          done
+            case "$@ " in
+              " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+              # The compiler in the base compile command matches
+              # the one in the tagged configuration.
+              # Assume this is the tagged configuration we want.
+              tagname=$z
+              break
+              ;;
+            esac
+          fi
+        done
+        # If $tagname still isn't set, then no tagged configuration
+        # was found and let the user know that the "--tag" command
+        # line option must be used.
+        if test -z "$tagname"; then
+          $echo "$modename: unable to infer tagged configuration"
+          $echo "$modename: specify a tag with \`--tag'" 1>&2
+          exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+        fi
+        ;;
+      esac
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives () {
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
+
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
+    fi
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+        [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+        *) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xdir="$my_gentop/$my_xlib"
+
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      status=$?
+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
+        exit $status
+      fi
+      case $host in
+      *-darwin*)
+        $show "Extracting $my_xabs"
+        # Do not bother doing anything if just a dry run
+        if test -z "$run"; then
+          darwin_orig_dir=`pwd`
+          cd $my_xdir || exit $?
+          darwin_archive=$my_xabs
+          darwin_curdir=`pwd`
+          darwin_base_archive=`basename $darwin_archive`
+          darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+          if test -n "$darwin_arches"; then 
+            darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+            darwin_arch=
+            $show "$darwin_base_archive has multiple architectures $darwin_arches"
+            for darwin_arch in  $darwin_arches ; do
+              mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+              lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+              # Remove the table of contents from the thin files.
+              $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
+              $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
+              cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+              $AR -xo "${darwin_base_archive}"
+              rm "${darwin_base_archive}"
+              cd "$darwin_curdir"
+            done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+            darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
+            darwin_file=
+            darwin_files=
+            for darwin_file in $darwin_filelist; do
+              darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+              lipo -create -output "$darwin_file" $darwin_files
+            done # $darwin_filelist
+            rm -rf unfat-$$
+            cd "$darwin_orig_dir"
+          else
+            cd $darwin_orig_dir
+            (cd $my_xdir && $AR x $my_xabs) || exit $?
+          fi # $darwin_arches
+        fi # $run
+      ;;
+      *)
+        # We will extract separately just the conflicting names and we will
+        # no longer touch any unique names. It is faster to leave these
+        # extract automatically by $AR in one run.
+        $show "(cd $my_xdir && $AR x $my_xabs)"
+        $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
+        if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
+          :
+        else
+          $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+          $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+          $AR t "$my_xabs" | sort | uniq -cd | while read -r count name
+          do
+            i=1
+            while test "$i" -le "$count"
+            do
+              # Put our $i before any first dot (extension)
+              # Never overwrite any file
+              name_to="$name"
+              while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
+              do
+                name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+              done
+              $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
+              $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
+              i=`expr $i + 1`
+            done
+          done
+        fi
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
 # End of Shell function definitions
 #####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
 
 # Parse our command line options once, thoroughly.
@@ -177 +382 @@
     tag)
       tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
 
       # Check whether tagname contains only valid characters
@@ -182 +388 @@
       *[!-_A-Za-z0-9,/]*)
         $echo "$progname: invalid tag name: $tagname" 1>&2
-        exit 1
+        exit $EXIT_FAILURE
         ;;
       esac
@@ -192 +398 @@
         ;;
       *)
-        if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+        if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
           taglist="$taglist $tagname"
           # Evaluate the configuration.
-          eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+          eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
         else
           $echo "$progname: ignoring unknown tag $tagname" 1>&2
@@ -224 +430 @@
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
     done
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
@@ -239 +445 @@
     $echo "$progname: enabling shell trace mode"
     set -x
+    preserve_args="$preserve_args $arg"
     ;;
 
@@ -257 +464 @@
       $echo "disable static libraries"
     fi
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
@@ -269 +476 @@
   --quiet | --silent)
     show=:
+    preserve_args="$preserve_args $arg"
     ;;
 
@@ -276 +484 @@
     shift
     prev=tag
+    preserve_args="$preserve_args --tag"
     ;;
 
@@ -286 +495 @@
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
 
@@ -299 +508 @@
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
@@ -308 +517 @@
 
 if test -z "$show_help"; then
-  archargs=
-  case $host in
-  *-*-darwin*)
-    # For darwin, separate arch arguments and apply them to all compile/link
-    # commands
-    doarch=
-    for arg; do
-      if test -n "$doarch"; then
-        archargs="$archargs -arch $arg"
-        doarch=
-        continue
-      fi
-      case $arg in
-      -arch) doarch=y;;
-      esac
-    done
-  esac
 
   # Infer the operation mode.
@@ -372 +564 @@
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 
@@ -387 +579 @@
     base_compile=
     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
     suppress_output=
     arg_mode=normal
     libobj=
+    later=
 
     for arg
@@ -412 +606 @@
           if test -n "$libobj" ; then
             $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
           arg_mode=target
@@ -418 +612 @@
           ;;
 
-        -static)
-          build_old_libs=yes
+        -static | -prefer-pic | -prefer-non-pic)
+          later="$later $arg"
           continue
           ;;
 
-        -prefer-pic)
-          pic_mode=yes
-          continue
-          ;;
-
-        -prefer-non-pic)
-          pic_mode=no
+        -no-suppress)
+          suppress_opt=no
           continue
           ;;
@@ -442 +631 @@
           lastarg=
           save_ifs="$IFS"; IFS=','
-          for arg in $args; do
+          for arg in $args; do
             IFS="$save_ifs"
 
@@ -492 +681 @@
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *)
@@ -529 +718 @@
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     esac
 
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-        for z in $available_tags; do
-          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-            # Evaluate the configuration.
-            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-            case "$base_compile " in
-            "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-              # The compiler in the base compile command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-              ;;
-            esac
-          fi
-        done
-        # If $tagname still isn't set, then no tagged configuration
-        # was found and let the user know that the "--tag" command
-        # line option must be used.
-        if test -z "$tagname"; then
-          $echo "$modename: unable to infer tagged configuration"
-          $echo "$modename: specify a tag with \`--tag'" 1>&2
-          exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-        fi
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -static)
+        build_old_libs=yes
+        continue
+        ;;
+
+      -prefer-pic)
+        pic_mode=yes
+        continue
+        ;;
+
+      -prefer-non-pic)
+        pic_mode=no
+        continue
         ;;
       esac
-    fi
+    done
 
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
@@ -586 +755 @@
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -597 +766 @@
 
     $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
@@ -616 +785 @@
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
@@ -626 +795 @@
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
         $show "Waiting for $lockfile to be removed"
         sleep 2
@@ -644 +813 @@
 
         $run $rm $removelist
-        exit 1
+        exit $EXIT_FAILURE
       fi
       $echo $srcfile > "$lockfile"
@@ -699 +868 @@
       else
         test -n "$output_obj" && $run $rm $removelist
-        exit 1
+        exit $EXIT_FAILURE
       fi
 
@@ -719 +888 @@
 
         $run $rm $removelist
-        exit 1
+        exit $EXIT_FAILURE
       fi
 
@@ -740 +909 @@
 
       # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
+      if test "$suppress_opt" = yes; then
+        suppress_output=' >/dev/null 2>&1'
+      fi
     else
       # No PIC object so indicate it doesn't exist in the libtool
@@ -769 +940 @@
       else
         $run $rm $removelist
-        exit 1
+        exit $EXIT_FAILURE
       fi
 
@@ -789 +960 @@
 
         $run $rm $removelist
-        exit 1
+        exit $EXIT_FAILURE
       fi
 
@@ -827 +998 @@
     fi
 
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
@@ -853 +1024 @@
     esac
     libtool_args="$nonopt"
-    base_compile="$nonopt"
+    base_compile="$nonopt $@"
     compile_command="$nonopt"
     finalize_command="$nonopt"
@@ -885 +1056 @@
     objs=
     non_pic_objects=
+    precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -898 +1070 @@
     vinfo_number=no
 
+    func_infer_tag $base_compile
+
     # We need to know -static, to get the right output filenames.
     for arg
@@ -929 +1103 @@
     while test "$#" -gt 0; do
       arg="$1"
-      base_compile="$base_compile $arg"
       shift
       case $arg in
@@ -993 +1166 @@
           if test ! -f "$arg"; then
             $echo "$modename: symbol file \`$arg' does not exist"
-            exit 1
+            exit $EXIT_FAILURE
           fi
           prev=
@@ -1005 +1178 @@
         inst_prefix)
           inst_prefix_dir="$arg"
+          prev=
+          continue
+          ;;
+        precious_regex)
+          precious_files_regex="$arg"
           prev=
           continue
@@ -1040 +1218 @@
                    test "$non_pic_object" = none; then
                   $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-                  exit 1
+                  exit $EXIT_FAILURE
                 fi
 
@@ -1093 +1271 @@
                 if test -z "$run"; then
                   $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-                  exit 1
+                  exit $EXIT_FAILURE
                 else
                   # Dry-run case.
@@ -1114 +1292 @@
           else
             $echo "$modename: link input file \`$save_arg' does not exist"
-            exit 1
+            exit $EXIT_FAILURE
           fi
           arg=$save_arg
@@ -1126 +1304 @@
           *)
             $echo "$modename: only absolute run-paths are allowed" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
             ;;
           esac
@@ -1166 +1344 @@
           continue
           ;;
+        shrext)
+          shrext_cmds="$arg"
+          prev=
+          continue
+          ;;
         *)
           eval "$prev=\"\$arg\""
@@ -1214 +1397 @@
         if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
           $echo "$modename: more than one -exported-symbols argument is not allowed"
-          exit 1
+          exit $EXIT_FAILURE
         fi
         if test "X$arg" = "X-export-symbols"; then
@@ -1250 +1433 @@
           if test -z "$absdir"; then
             $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
           dir="$absdir"
@@ -1305 +1488 @@
         ;;
 
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+        deplibs="$deplibs $arg"
+        continue
+        ;;
+
       -module)
         module=yes
@@ -1369 +1557 @@
       -o) prev=output ;;
 
+      -precious-files-regex)
+        prev=precious_regex
+        continue
+        ;;
+
       -release)
         prev=release
@@ -1391 +1584 @@
         *)
           $echo "$modename: only absolute run-paths are allowed" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -1514 +1707 @@
              test "$non_pic_object" = none; then
             $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
 
@@ -1567 +1760 @@
           if test -z "$run"; then
             $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           else
             # Dry-run case.
@@ -1634 +1827 @@
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-        for z in $available_tags; do
-          if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-            # Evaluate the configuration.
-            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-            case $base_compile in
-            "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-              # The compiler in $compile_command matches
-              # the one in the tagged configuration.
-              # Assume this is the tagged configuration we want.
-              tagname=$z
-              break
-              ;;
-            esac
-          fi
-        done
-        # If $tagname still isn't set, then no tagged configuration
-        # was found and let the user know that the "--tag" command
-        # line option must be used.
-        if test -z "$tagname"; then
-          $echo "$modename: unable to infer tagged configuration"
-          $echo "$modename: specify a tag with \`--tag'" 1>&2
-          exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-        fi
-        ;;
-      esac
+      exit $EXIT_FAILURE
     fi
 
@@ -1719 +1871 @@
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *.$libext) linkmode=oldlib ;;
@@ -1729 +1881 @@
     case $host in
     *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
+      # don't eliminate duplications in $postdeps and $predeps
       duplicate_compiler_generated_deps=yes
       ;;
@@ -1782 +1934 @@
           *)
             $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
             ;;
           esac
@@ -1820 +1972 @@
         found=no
         case $deplib in
+        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+          if test "$linkmode,$pass" = "prog,link"; then
+            compile_deplibs="$deplib $compile_deplibs"
+            finalize_deplibs="$deplib $finalize_deplibs"
+          else
+            deplibs="$deplib $deplibs"
+          fi
+          continue
+          ;;
         -l*)
           if test "$linkmode" != lib && test "$linkmode" != prog; then
@@ -1831 +1992 @@
           name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
           for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-            # Search the libtool library
-            lib="$searchdir/lib${name}.la"
-            if test -f "$lib"; then
-              found=yes
-              break
-            fi
+            for search_ext in .la $std_shrext .so .a; do
+              # Search the libtool library
+              lib="$searchdir/lib${name}${search_ext}"
+              if test -f "$lib"; then
+                if test "$search_ext" = ".la"; then
+                  found=yes
+                else
+                  found=no
+                fi
+                break 2
+              fi
+            done
           done
           if test "$found" != yes; then
@@ -1901 +2068 @@
             if test "$pass" = scan; then
               deplibs="$deplib $deplibs"
-              newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
             else
               compile_deplibs="$deplib $compile_deplibs"
               finalize_deplibs="$deplib $finalize_deplibs"
             fi
+            newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
             ;;
           *)
@@ -1933 +2100 @@
           case $linkmode in
           lib)
-            if test "$deplibs_check_method" != pass_all; then
+            valid_a_lib=no
+            case $deplibs_check_method in
+              match_pattern*)
+                set dummy $deplibs_check_method
+                match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+                if eval $echo \"$deplib\" 2>/dev/null \
+                    | $SED 10q \
+                    | $EGREP "$match_pattern_regex" > /dev/null; then
+                  valid_a_lib=yes
+                fi
+                ;;
+              pass_all)
+                valid_a_lib=yes
+                ;;
+            esac
+            if test "$valid_a_lib" != yes; then
               $echo
               $echo "*** Warning: Trying to link with static lib archive $deplib."
@@ -1984 +2166 @@
         else
           $echo "$modename: cannot find the library \`$lib'" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -1991 +2173 @@
         else
           $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -2027 +2209 @@
             if test -z "$old_library"; then
               $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-              exit 1
+              exit $EXIT_FAILURE
             fi
             # It is a libtool convenience library, so add in its objects.
@@ -2044 +2226 @@
           elif test "$linkmode" != prog && test "$linkmode" != lib; then
             $echo "$modename: \`$lib' is not a convenience library" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
           continue
         fi # $pass = conv
 
-    
+
         # Get the name of the library we link against.
         linklib=
@@ -2057 +2239 @@
         if test -z "$linklib"; then
           $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -2064 +2246 @@
           if test -z "$libdir"; then
             $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-            exit 1
-          fi
-          if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+            exit $EXIT_FAILURE
+          fi
+          if test -z "$dlname" ||
+             test "$dlopen_support" != yes ||
+             test "$build_libtool_libs" = no; then
             # If there is no dlname, no dlopen support or we're linking
             # statically, we need to preload.  We also need to preload any
@@ -2104 +2288 @@
           fi
         else
-          dir="$ladir/$objdir"
-          absdir="$abs_ladir/$objdir"
-          # Remove this search path later
-          notinst_path="$notinst_path $abs_ladir"
+          if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+            dir="$ladir"
+            absdir="$abs_ladir"
+            # Remove this search path later
+            notinst_path="$notinst_path $abs_ladir"
+          else
+            dir="$ladir/$objdir"
+            absdir="$abs_ladir/$objdir"
+            # Remove this search path later
+            notinst_path="$notinst_path $abs_ladir"
+          fi
         fi # $installed = yes
         name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2115 +2306 @@
           if test -z "$libdir"; then
             $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
           # Prefer using a static library (so that no silly _DYNAMIC symbols
@@ -2142 +2333 @@
         fi
 
-    
+
         if test "$linkmode" = prog && test "$pass" != link; then
           newlib_search_path="$newlib_search_path $ladir"
@@ -2229 +2420 @@
           fi
           # This is a shared library
-        
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+
+          # Warn about portability, can't link against -module's on
+          # some systems (darwin)
+          if test "$shouldnotlink" = yes && test "$pass" = link ; then
             $echo
             if test "$linkmode" = prog; then
@@ -2238 +2430 @@
               $echo "*** Warning: Linking the shared library $output against the loadable module"
             fi
-            $echo "*** $linklib is not portable!"    
-      fi          
+            $echo "*** $linklib is not portable!"
+          fi
           if test "$linkmode" = lib &&
              test "$hardcode_into_libs" = yes; then
@@ -2296 +2488 @@
             else
               $show "extracting exported symbol list from \`$soname'"
-              save_ifs="$IFS"; IFS=$_S_
-              eval cmds=\"$extract_expsyms_cmds\"
+              save_ifs="$IFS"; IFS='~'
+              cmds=$extract_expsyms_cmds
               for cmd in $cmds; do
                 IFS="$save_ifs"
+                eval cmd=\"$cmd\"
                 $show "$cmd"
                 $run eval "$cmd" || exit $?
@@ -2309 +2502 @@
             if test -f "$output_objdir/$newlib"; then :; else
               $show "generating import library for \`$soname'"
-              save_ifs="$IFS"; IFS=$_S_
-              eval cmds=\"$old_archive_from_expsyms_cmds\"
+              save_ifs="$IFS"; IFS='~'
+              cmds=$old_archive_from_expsyms_cmds
               for cmd in $cmds; do
                 IFS="$save_ifs"
+                eval cmd=\"$cmd\"
                 $show "$cmd"
                 $run eval "$cmd" || exit $?
@@ -2335 +2529 @@
                   *-*-sco3.2v5* ) add_dir="-L$dir" ;;
                   *-*-darwin* )
-                    # if the lib is a module then we can not link against it, someone
-                    # is ignoring the new warnings I added
-                    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+                    # if the lib is a module then we can not link against
+                    # it, someone is ignoring the new warnings I added
+                    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
                       $echo "** Warning, lib $linklib is a module, not a shared library"
                       if test -z "$old_library" ; then
@@ -2345 +2539 @@
                       else
                         add="$dir/$old_library"
-                      fi 
+                      fi
                     fi
                 esac
@@ -2370 +2564 @@
                   case "$libdir" in
                     [\\/]*)
-                      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+                      add_dir="$add_dir -L$inst_prefix_dir$libdir"
                       ;;
                   esac
@@ -2387 +2581 @@
             if test "$lib_linked" != yes; then
               $echo "$modename: configuration error: unsupported hardcode properties"
-              exit 1
+              exit $EXIT_FAILURE
             fi
 
@@ -2430 +2624 @@
               add="-l$name"
             elif test "$hardcode_automatic" = yes; then
-              if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+              if test -n "$inst_prefix_dir" &&
+                 test -f "$inst_prefix_dir$libdir/$linklib" ; then
                 add="$inst_prefix_dir$libdir/$linklib"
               else
@@ -2442 +2637 @@
                 case "$libdir" in
                   [\\/]*)
-                    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+                    add_dir="$add_dir -L$inst_prefix_dir$libdir"
                     ;;
                 esac
@@ -2510 +2705 @@
         if test "$linkmode" = lib; then
           if test -n "$dependency_libs" &&
-             { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+             { test "$hardcode_into_libs" != yes ||
+               test "$build_old_libs" = yes ||
                test "$link_static" = yes; }; then
             # Extract -R from dependency_libs
@@ -2567 +2763 @@
                   if test -z "$libdir"; then
                     $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                    exit 1
+                    exit $EXIT_FAILURE
                   fi
                   if test "$absdir" != "$libdir"; then
@@ -2577 +2773 @@
                 case $host in
                 *-*-darwin*)
-                  # we do not want to link against static libs, but need to link against shared
+                  # we do not want to link against static libs,
+                  # but need to link against shared
                   eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
                   if test -n "$deplibrary_names" ; then
@@ -2585 +2782 @@
                     if test -f "$path/$depdepl" ; then
                       depdepl="$path/$depdepl"
-                   fi
-                    newlib_search_path="$newlib_search_path $path"
-                    path=""
+                    fi
+                    # do not add paths which are already there
+                    case " $newlib_search_path " in
+                    *" $path "*) ;;
+                    *) newlib_search_path="$newlib_search_path $path";;
+                    esac
                   fi
+                  path=""
                   ;;
                 *)
-                path="-L$path"
+                  path="-L$path"
+                  ;;
+                esac
                 ;;
-                esac 
-                
-                ;;
-                  -l*)
+              -l*)
                 case $host in
                 *-*-darwin*)
-                 # Again, we only want to link against shared libraries
-                 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-                 for tmp in $newlib_search_path ; do
-                     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-                       eval depdepl="$tmp/lib$tmp_libs.dylib"
-                       break
-                     fi  
-         done
-         path=""
+                  # Again, we only want to link against shared libraries
+                  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+                  for tmp in $newlib_search_path ; do
+                    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+                      eval depdepl="$tmp/lib$tmp_libs.dylib"
+                      break
+                    fi
+                  done
+                  path=""
                   ;;
                 *) continue ;;
-                esac              
+                esac
                 ;;
               *) continue ;;
@@ -2616 +2816 @@
               case " $deplibs " in
               *" $depdepl "*) ;;
-              *) deplibs="$deplibs $depdepl" ;;
-              esac            
+              *) deplibs="$depdepl $deplibs" ;;
+              esac
               case " $deplibs " in
               *" $path "*) ;;
@@ -2707 +2907 @@
         done # for var
       fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
       tmp_libs=
       for i in $dependency_libs ; do
@@ -2767 +2968 @@
       lib*)
         name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-        eval shared_ext=\"$shrext\"
+        eval shared_ext=\"$shrext_cmds\"
         eval libname=\"$libname_spec\"
         ;;
@@ -2774 +2975 @@
           $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
         if test "$need_lib_prefix" != no; then
           # Add the "lib" prefix for modules if required
           name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-          eval shared_ext=\"$shrext\"
+          eval shared_ext=\"$shrext_cmds\"
           eval libname=\"$libname_spec\"
         else
@@ -2790 +2991 @@
         if test "$deplibs_check_method" != pass_all; then
           $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-          exit 1
+          exit $EXIT_FAILURE
         else
           $echo
@@ -2838 +3039 @@
           $echo "$modename: too many parameters to \`-version-info'" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -2844 +3045 @@
         # this retains compatibility with .la files and attempts
         # to make the code below a bit more comprehensible
-        
+
         case $vinfo_number in
         yes)
@@ -2888 +3089 @@
           $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
           $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -2897 +3098 @@
           $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
           $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -2906 +3107 @@
           $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
           $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -2913 +3114 @@
           $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
           $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -2930 +3131 @@
           # Darwin ld doesn't like 0 for these options...
           minor_current=`expr $current + 1`
-          verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
           ;;
 
@@ -3002 +3203 @@
           $echo "$modename: unknown library version type \`$version_type'" 1>&2
           $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -3056 +3257 @@
                ;;
             $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+               if test "X$precious_files_regex" != "X"; then
+                 if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                 then
+                   continue
+                 fi
+               fi
                removelist="$removelist $p"
                ;;
@@ -3176 +3383 @@
 EOF
           $rm conftest
-          $LTCC $archargs -o conftest conftest.c $deplibs
+          $LTCC -o conftest conftest.c $deplibs
           if test "$?" -eq 0 ; then
             ldd_output=`ldd conftest`
@@ -3221 +3428 @@
               if test "$name" != "" && test "$name" != "0"; then
                 $rm conftest
-                $LTCC $archargs -o conftest conftest.c $i
+                $LTCC -o conftest conftest.c $i
                 # Did it work?
                 if test "$?" -eq 0 ; then
@@ -3535 +3742 @@
 
         # Get the real and link names of the library.
-        eval shared_ext=\"$shrext\"
+        eval shared_ext=\"$shrext_cmds\"
         eval library_names=\"$library_names_spec\"
         set dummy $library_names
@@ -3565 +3772 @@
             export_symbols="$output_objdir/$libname.exp"
             $run $rm $export_symbols
-            eval cmds=\"$export_symbols_cmds\"
-            save_ifs="$IFS"; IFS=$_S_
+            cmds=$export_symbols_cmds
+            save_ifs="$IFS"; IFS='~'
             for cmd in $cmds; do
               IFS="$save_ifs"
+              eval cmd=\"$cmd\"
               if len=`expr "X$cmd" : ".*"` &&
                test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -3598 +3806 @@
                 case " $convenience " in
                 *" $test_deplib "*) ;;
-                *) 
+                *)
                         tmp_deplibs="$tmp_deplibs $test_deplib"
                         ;;
                 esac
         done
-        deplibs="$tmp_deplibs" 
+        deplibs="$tmp_deplibs"
 
         if test -n "$convenience"; then
@@ -3611 +3819 @@
           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
-              case $host in
-              *-*-darwin*)
-                # ranlib-ed archives of fat binaries are converted to a fat xabs that
-                # ar can't use.  So we to split the fat xabs into non-fat ones to unpack.
-                # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
-                d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
-                if test -n "$d_archs"; then
-                  $echo "$modename: manually unpacking fat archive $xabs" 1>&2
-                  d_name=`basename $xabs`
-                  d_dir="/tmp/fat_ar.$$"
-                  d_files=''
-
-                  for d_arch in $d_archs; do
-                    d_archdir="$d_dir/$d_arch"
-                    $show "$mkdir -p $d_archdir"
-                    $run $mkdir -p "$d_archdir"
-
-                    $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
-                    $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
-
-                    $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
-                    $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
-
-                    $show "${rm} $d_dir/$d_name"
-                    $run ${rm} "$d_dir/$d_name"
-                  done
-
-                  # Can't deal with blanks in file names
-                  $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
-
-                  for d_file in $d_files; do
-                    $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
-                    $show "lipo -create $d_f -o $xdir/$d_file"
-                    $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
-                  done
-
-                  $show "${rm}r $d_dir"
-                  $run ${rm}r "$d_dir"
-                else
-                  $show "(cd $xdir && $AR x $xabs)"
-                  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-                fi
-                ;;
-              *)
-                # We will extract separately just the conflicting names and we will no
-                # longer touch any unique names. It is faster to leave these extract
-                # automatically by $AR in one run.
-                $show "(cd $xdir && $AR x $xabs)"
-                $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-                if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-                  :
-                else
-                  $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-                  $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-                  $AR t "$xabs" | sort | uniq -cd | while read -r count name
-                  do
-                    i=1
-                    while test "$i" -le "$count"
-                    do
-                     # Put our $i before any first dot (extension)
-                     # Never overwrite any file
-                     name_to="$name"
-                     while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-                     do
-                       name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-                     done
-                     $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-                     $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-                     i=`expr $i + 1`
-                    done
-                  done
-                fi
-                ;;
-              esac
-
-              libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-            done
-          fi
-        fi
-
+            func_extract_archives $gentop $convenience
+            libobjs="$libobjs $func_extract_archives_result"
+          fi
+        fi
+        
         if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
           eval flag=\"$thread_safe_flag_spec\"
@@ -3731 +3839 @@
         if test "$module" = yes && test -n "$module_cmds" ; then
           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-            eval cmds=\"$module_expsym_cmds\"
+            eval test_cmds=\"$module_expsym_cmds\"
+            cmds=$module_expsym_cmds
           else
-            eval cmds=\"$module_cmds\"
+            eval test_cmds=\"$module_cmds\"
+            cmds=$module_cmds
           fi
         else
         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-          eval cmds=\"$archive_expsym_cmds\"
+          eval test_cmds=\"$archive_expsym_cmds\"
+          cmds=$archive_expsym_cmds
         else
-          eval cmds=\"$archive_cmds\"
-          fi
-        fi
-
-        if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+          eval test_cmds=\"$archive_cmds\"
+          cmds=$archive_cmds
+          fi
+        fi
+
+        if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
           :
@@ -3789 +3901 @@
                 # All subsequent reloadable object files will link in
                 # the last one created.
-                eval concat_cmds=\"\$concat_cmds${_S_}$reload_cmds $objlist $last_robj\"
+                eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
               fi
               last_robj=$output_objdir/$save_output-${k}.$objext
@@ -3801 +3913 @@
           # reloadable object file.  All subsequent reloadable object
           # files will link in the last one created.
-          test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_}
+          test -z "$concat_cmds" || concat_cmds=$concat_cmds~
           eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
 
@@ -3810 +3922 @@
             libobjs=$output
             # Append the command to create the export file.
-            eval concat_cmds=\"\$concat_cmds${_S_}$export_symbols_cmds\"
+            eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
           fi
 
@@ -3825 +3937 @@
 
           # Loop through the commands generated above and execute them.
-          save_ifs="$IFS"; IFS=$_S_
+          save_ifs="$IFS"; IFS='~'
           for cmd in $concat_cmds; do
             IFS="$save_ifs"
@@ -3844 +3956 @@
 
           # Do each of the archive commands.
+          if test "$module" = yes && test -n "$module_cmds" ; then
+            if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+              cmds=$module_expsym_cmds
+            else
+              cmds=$module_cmds
+            fi
+          else
           if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-            eval cmds=\"$archive_expsym_cmds\"
+            cmds=$archive_expsym_cmds
           else
-            eval cmds=\"$archive_cmds\"
+            cmds=$archive_cmds
+            fi
           fi
 
           # Append the command to remove the reloadable object files
           # to the just-reset $cmds.
-          eval cmds=\"\$cmds${_S_}$rm $delfiles\"
-        fi
-        save_ifs="$IFS"; IFS=$_S_
+          eval cmds=\"\$cmds~\$rm $delfiles\"
+        fi
+        save_ifs="$IFS"; IFS='~'
         for cmd in $cmds; do
           IFS="$save_ifs"
+          eval cmd=\"$cmd\"
           $show "$cmd"
           $run eval "$cmd" || exit $?
@@ -3865 +3986 @@
         if test "$mode" = relink; then
           $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-          exit 0
+          exit $EXIT_SUCCESS
         fi
 
@@ -3913 +4034 @@
         if test -n "$objs$old_deplibs"; then
           $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
         libobj="$output"
@@ -3942 +4063 @@
         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
-            case $host in
-            *-*-darwin*)
-              # ranlib-ed archives of fat binaries are converted to a fat xabs that
-              # ar can't use.  So we to split the fat xabs into non-fat ones to unpack.
-              # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
-              d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
-              if test -n "$d_archs"; then
-                $echo "$modename: manually unpacking fat archive $xabs" 1>&2
-                d_name=`basename $xabs`
-                d_dir="/tmp/fat_ar.$$"
-                d_files=''
-
-                for d_arch in $d_archs; do
-                  d_archdir="$d_dir/$d_arch"
-                  $show "$mkdir -p $d_archdir"
-                  $run $mkdir -p "$d_archdir"
-
-                  $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
-                  $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
-
-                  $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
-                  $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
-
-                  $show "${rm} $d_dir/$d_name"
-                  $run ${rm} "$d_dir/$d_name"
-                done
-
-                # Can't deal with blanks in file names
-                $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
-
-                for d_file in $d_files; do
-                  $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
-                  $show "lipo -create $d_f -o $xdir/$d_file"
-                  $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
-                done
-
-                $show "${rm}r $d_dir"
-                $run ${rm}r "$d_dir"
-              else
-                $show "(cd $xdir && $AR x $xabs)"
-                $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-              fi
-              ;;
-            *)
-              # We will extract separately just the conflicting names and we will no
-              # longer touch any unique names. It is faster to leave these extract
-              # automatically by $AR in one run.
-              $show "(cd $xdir && $AR x $xabs)"
-              $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-              if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-                :
-              else
-                $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-                $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-                $AR t "$xabs" | sort | uniq -cd | while read -r count name
-                do
-                  i=1
-                  while test "$i" -le "$count"
-                  do
-                   # Put our $i before any first dot (extension)
-                   # Never overwrite any file
-                   name_to="$name"
-                   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-                   do
-                     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-                   done
-                   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-                   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-                   i=`expr $i + 1`
-                  done
-                done
-              fi
-              ;;
-            esac
-
-            reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-          done
+          func_extract_archives $gentop $convenience
+          reload_conv_objs="$reload_objs $func_extract_archives_result"
         fi
       fi
@@ -4053 +4074 @@
 
       output="$obj"
-      eval cmds=\"$reload_cmds\"
-      save_ifs="$IFS"; IFS=$_S_
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
         IFS="$save_ifs"
+        eval cmd=\"$cmd\"
         $show "$cmd"
         $run eval "$cmd" || exit $?
@@ -4069 +4091 @@
         fi
 
-        exit 0
+        exit $EXIT_SUCCESS
       fi
 
@@ -4082 +4104 @@
         # $show "echo timestamp > $libobj"
         # $run eval "echo timestamp > $libobj" || exit $?
-        exit 0
+        exit $EXIT_SUCCESS
       fi
 
@@ -4089 +4111 @@
         reload_objs="$libobjs $reload_conv_objs"
         output="$libobj"
-        eval cmds=\"$reload_cmds\"
-        save_ifs="$IFS"; IFS=$_S_
+        cmds=$reload_cmds
+        save_ifs="$IFS"; IFS='~'
         for cmd in $cmds; do
           IFS="$save_ifs"
+          eval cmd=\"$cmd\"
           $show "$cmd"
           $run eval "$cmd" || exit $?
@@ -4104 +4127 @@
       fi
 
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
 
@@ -4409 +4432 @@
 
           # Now compile the dynamic symbol file.
-          $show "(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-          $run eval '(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+          $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+          $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 
           # Clean up the generated files.
@@ -4422 +4445 @@
         *)
           $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -4510 +4533 @@
         $show "$link_command"
         $run eval "$link_command" || exit $?
-        exit 0
+        exit $EXIT_SUCCESS
       fi
 
@@ -4565 +4588 @@
 
       # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-        case $0 in
-        [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-        *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+        case $progpath in
+        [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+        *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
         esac
         qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
@@ -4594 +4617 @@
             cwrapper=`$echo ${output}.exe`
             $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
             cat > $cwrappersource <<EOF
@@ -4603 +4626 @@
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
-   
+
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
@@ -4635 +4658 @@
   defined (__OS2__)
 #define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
+#ifndef DIR_SEPARATOR_2
 #define DIR_SEPARATOR_2 '\\'
 #endif
@@ -4666 +4689 @@
   char **newargz;
   int i;
-  
+
   program_name = (char *) xstrdup ((char *) basename (argv[0]));
   newargz = XMALLOC(char *, argc+2);
@@ -4679 +4702 @@
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
+  strendzap(newargz[1],".exe");
   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
@@ -4702 +4725 @@
 }
 
-char * 
+char *
 xstrdup (const char *string)
 {
@@ -4716 +4739 @@
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
+  if (isalpha (name[0]) && name[1] == ':')
     name += 2;
 #endif
@@ -4726 +4749 @@
 }
 
-char * 
+char *
 fnqualify(const char *path)
 {
@@ -4754 +4777 @@
 
 char *
-strendzap(char *str, const char *pat) 
+strendzap(char *str, const char *pat)
 {
   size_t len, patlen;
@@ -4774 +4797 @@
 
 static void
-lt_error_core (int exit_status, const char * mode, 
+lt_error_core (int exit_status, const char * mode,
           const char * message, va_list ap)
 {
@@ -4799 +4822 @@
           # Since the "real" binary is built for $host, then this
           # wrapper might as well be built for $host, too.
-          $run $LTCC $archargs -s -o $cwrapper $cwrappersource
+          $run $LTCC -s -o $cwrapper $cwrappersource
           ;;
         esac
         $rm $output
-        trap "$rm $output; exit 1" 1 2 15
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
         $echo > $output "\
@@ -4824 +4847 @@
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 relink_command=\"$relink_command\"
@@ -4903 +4926 @@
         $echo \"\$relink_command_output\" >&2
         $rm \"\$progdir/\$file\"
-        exit 1
+        exit $EXIT_FAILURE
       fi
     fi
@@ -4965 +4988 @@
         $echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
+      exit $EXIT_FAILURE
     fi
   else
@@ -4972 +4995 @@
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi\
@@ -4978 +5001 @@
         chmod +x $output
       fi
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
     esac
@@ -5001 +5024 @@
       if test -n "$addlibs"; then
         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"
 
-        # Add in members from convenience archives.
-        for xlib in $addlibs; 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
-          case $host in
-          *-*-darwin*)
-            # ranlib-ed archives of fat binaries are converted to a fat xabs that
-            # ar can't use.  So we to split the fat xabs into non-fat ones to unpack.
-            # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
-            d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
-            if test -n "$d_archs"; then
-              $echo "$modename: manually unpacking fat archive $xabs" 1>&2
-              d_name=`basename $xabs`
-              d_dir="/tmp/fat_ar.$$"
-              d_files=''
-
-              for d_arch in $d_archs; do
-                d_archdir="$d_dir/$d_arch"
-                $show "$mkdir -p $d_archdir"
-                $run $mkdir -p "$d_archdir"
-
-                $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
-                $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
-
-                $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
-                $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
-
-                $show "${rm} $d_dir/$d_name"
-                $run ${rm} "$d_dir/$d_name"
-              done
-
-              # Can't deal with blanks in file names
-              $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
-
-              for d_file in $d_files; do
-                $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
-                $show "lipo -create $d_f -o $xdir/$d_file"
-                $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
-              done
-
-              $show "${rm}r $d_dir"
-              $run ${rm}r "$d_dir"
-            else
-              $show "(cd $xdir && $AR x $xabs)"
-              $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-            fi
-            ;;
-          *)
-            # We will extract separately just the conflicting names and we will no
-            # longer touch any unique names. It is faster to leave these extract
-            # automatically by $AR in one run.
-            $show "(cd $xdir && $AR x $xabs)"
-            $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-            if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-              :
-            else
-              $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-              $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-              $AR t "$xabs" | sort | uniq -cd | while read -r count name
-              do
-                i=1
-                while test "$i" -le "$count"
-                do
-                 # Put our $i before any first dot (extension)
-                 # Never overwrite any file
-                 name_to="$name"
-                 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-                 do
-                   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-                 done
-                 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-                 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-                 i=`expr $i + 1`
-                done
-              done
-            fi
-            ;;
-          esac
-
-          oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-        done
+        func_extract_archives $gentop $addlibs
+        oldobjs="$oldobjs $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-        eval cmds=\"$old_archive_from_new_cmds\"
+       cmds=$old_archive_from_new_cmds
       else
         eval cmds=\"$old_archive_cmds\"
@@ -5116 +5038 @@
         if len=`expr "X$cmds" : ".*"` &&
              test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-          :
+          cmds=$old_archive_cmds
         else
           # the command line is too long to link in one step, link in parts
@@ -5143 +5065 @@
           do
             last_oldobj=$obj
-          done  
+          done
           for obj in $save_oldobjs
           do
@@ -5157 +5079 @@
               if test "$obj" = "$last_oldobj" ; then
                 RANLIB=$save_RANLIB
-              fi  
-              test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_}
+              fi
+              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
               eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
               objlist=
@@ -5168 +5090 @@
             eval cmds=\"\$concat_cmds\"
           else
-            eval cmds=\"\$concat_cmds${_S_}$old_archive_cmds\"
-          fi
-        fi
-      fi
-      save_ifs="$IFS"; IFS=$_S_
+            eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+          fi
+        fi
+      fi
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
+        eval cmd=\"$cmd\"
         IFS="$save_ifs"
         $show "$cmd"
@@ -5205 +5128 @@
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+        relink_command=
+      fi
+
 
       # Only create the output if not a dry run.
@@ -5225 +5152 @@
                 if test -z "$libdir"; then
                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                  exit 1
+                  exit $EXIT_FAILURE
                 fi
                 newdependency_libs="$newdependency_libs $libdir/$name"
@@ -5239 +5166 @@
               if test -z "$libdir"; then
                 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-                exit 1
+                exit $EXIT_FAILURE
               fi
               newdlfiles="$newdlfiles $libdir/$name"
@@ -5250 +5177 @@
               if test -z "$libdir"; then
                 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-                exit 1
+                exit $EXIT_FAILURE
               fi
               newdlprefiles="$newdlprefiles $libdir/$name"
+            done
+            dlprefiles="$newdlprefiles"
+          else
+            newdlfiles=
+            for lib in $dlfiles; do
+              case $lib in
+                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+                *) abs=`pwd`"/$lib" ;;
+              esac
+              newdlfiles="$newdlfiles $abs"
+            done
+            dlfiles="$newdlfiles"
+            newdlprefiles=
+            for lib in $dlprefiles; do
+              case $lib in
+                [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+                *) abs=`pwd`"/$lib" ;;
+              esac
+              newdlprefiles="$newdlprefiles $abs"
             done
             dlprefiles="$newdlprefiles"
@@ -5311 +5257 @@
       ;;
     esac
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
@@ -5400 +5346 @@
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -5406 +5352 @@
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -5416 +5362 @@
       fi
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -5437 +5383 @@
         $echo "$modename: \`$dest' is not a directory" 1>&2
         $echo "$help" 1>&2
-        exit 1
+        exit $EXIT_FAILURE
       fi
     fi
@@ -5449 +5395 @@
           $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -5478 +5424 @@
           $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -5520 +5466 @@
           if test "$inst_prefix_dir" = "$destdir"; then
             $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
 
@@ -5535 +5481 @@
           else
             $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
         fi
@@ -5570 +5516 @@
           # Do each command in the postinstall commands.
           lib="$destdir/$realname"
-          eval cmds=\"$postinstall_cmds\"
-          save_ifs="$IFS"; IFS=$_S_
+          cmds=$postinstall_cmds
+          save_ifs="$IFS"; IFS='~'
           for cmd in $cmds; do
             IFS="$save_ifs"
+            eval cmd=\"$cmd\"
             $show "$cmd"
             $run eval "$cmd" || exit $?
@@ -5613 +5560 @@
           $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
           ;;
         esac
@@ -5631 +5578 @@
           $run eval "$install_prog \$staticobj \$staticdest" || exit $?
         fi
-        exit 0
+        exit $EXIT_SUCCESS
         ;;
 
@@ -5685 +5632 @@
           if test -z "$notinst_deplibs"; then
             $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-            exit 1
+            exit $EXIT_FAILURE
           fi
 
@@ -5726 +5673 @@
               test -n "$TMPDIR" && tmpdir="$TMPDIR"
               tmpdir="$tmpdir/libtool-$$"
-              if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+              save_umask=`umask`
+              umask 0077
+              if $mkdir "$tmpdir"; then
+                umask $save_umask
               else
+                umask $save_umask
                 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
                 continue
@@ -5786 +5737 @@
       $run eval "$install_prog \$file \$oldlib" || exit $?
 
-      if test -n "$stripme" && test -n "$striplib"; then
+      if test -n "$stripme" && test -n "$old_striplib"; then
         $show "$old_striplib $oldlib"
         $run eval "$old_striplib $oldlib" || exit $?
@@ -5792 +5743 @@
 
       # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      save_ifs="$IFS"; IFS=$_S_
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
         IFS="$save_ifs"
+        eval cmd=\"$cmd\"
         $show "$cmd"
         $run eval "$cmd" || exit $?
@@ -5809 +5761 @@
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 --finish$current_libdirs'
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
     else
-      exit 0
+      exit $EXIT_SUCCESS
     fi
     ;;
@@ -5830 +5782 @@
         if test -n "$finish_cmds"; then
           # Do each command in the finish commands.
-          eval cmds=\"$finish_cmds\"
-          save_ifs="$IFS"; IFS=$_S_
+          cmds=$finish_cmds
+          save_ifs="$IFS"; IFS='~'
           for cmd in $cmds; do
             IFS="$save_ifs"
+            eval cmd=\"$cmd\"
             $show "$cmd"
             $run eval "$cmd" || admincmds="$admincmds
@@ -5850 +5803 @@
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
+    test "$show" = : && exit $EXIT_SUCCESS
 
     $echo "----------------------------------------------------------------------"
@@ -5886 +5839 @@
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
     $echo "----------------------------------------------------------------------"
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
@@ -5898 +5851 @@
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -5906 +5859 @@
         $echo "$modename: \`$file' is not a file" 1>&2
         $echo "$help" 1>&2
-        exit 1
+        exit $EXIT_FAILURE
       fi
 
@@ -5917 +5870 @@
           $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
           $echo "$help" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
 
@@ -5944 +5897 @@
         else
           $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-          exit 1
+          exit $EXIT_FAILURE
         fi
         ;;
@@ -6016 +5969 @@
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
+      exec_cmd="\"\$cmd\"$args"
     else
       # Display what would be done.
@@ -6023 +5976 @@
         $echo "export $shlibpath_var"
       fi
-      $echo "$cmd$args"
-      exit 0
+      eval \$echo \"\$cmd\"$args
+      exit $EXIT_SUCCESS
     fi
     ;;
@@ -6052 +6005 @@
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
@@ -6107 +6060 @@
             if test -n "$library_names"; then
               # Do each command in the postuninstall commands.
-              eval cmds=\"$postuninstall_cmds\"
-              save_ifs="$IFS"; IFS=$_S_
+              cmds=$postuninstall_cmds
+              save_ifs="$IFS"; IFS='~'
               for cmd in $cmds; do
                 IFS="$save_ifs"
+                eval cmd=\"$cmd\"
                 $show "$cmd"
                 $run eval "$cmd"
@@ -6122 +6076 @@
             if test -n "$old_library"; then
               # Do each command in the old_postuninstall commands.
-              eval cmds=\"$old_postuninstall_cmds\"
-              save_ifs="$IFS"; IFS=$_S_
+              cmds=$old_postuninstall_cmds
+              save_ifs="$IFS"; IFS='~'
               for cmd in $cmds; do
                 IFS="$save_ifs"
+                eval cmd=\"$cmd\"
                 $show "$cmd"
                 $run eval "$cmd"
@@ -6164 +6119 @@
           noexename=$name
           case $file in
-          *.exe) 
+          *.exe)
             file=`$echo $file|${SED} 's,.exe$,,'`
             noexename=`$echo $name|${SED} 's,.exe$,,'`
@@ -6209 +6164 @@
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
@@ -6216 +6171 @@
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
@@ -6222 +6177 @@
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
@@ -6258 +6213 @@
 
 Report bugs to <bug-libtool@gnu.org>."
-  exit 0
+  exit $EXIT_SUCCESS
   ;;
 
@@ -6370 +6325 @@
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
@@ -6411 +6368 @@
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
@@ -6418 +6375 @@
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $EXIT_SUCCESS
 
 # The TAGs below are defined such that we never get into a situation

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-23 02:07:27 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -186 +186 @@
 
     // Allocate and set metadata item comment
-    metadataItem->comment = (char *)psAlloc(sizeof(char) * MAX_STRING_LENGTH);
     if (comment == NULL) {
         // Per SDRS, null isn't allowed, must use "" instead
-        strncpy(metadataItem->comment, "", MAX_STRING_LENGTH);
+        metadataItem->comment = psStringCopy("");
     } else {
-        strncpy(metadataItem->comment, comment, MAX_STRING_LENGTH);
+        metadataItem->comment = psStringCopy(comment);
     }
 

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-23 02:07:27 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -186 +186 @@
 
     // Allocate and set metadata item comment
-    metadataItem->comment = (char *)psAlloc(sizeof(char) * MAX_STRING_LENGTH);
     if (comment == NULL) {
         // Per SDRS, null isn't allowed, must use "" instead
-        strncpy(metadataItem->comment, "", MAX_STRING_LENGTH);
+        metadataItem->comment = psStringCopy("");
     } else {
-        strncpy(metadataItem->comment, comment, MAX_STRING_LENGTH);
+        metadataItem->comment = psStringCopy(comment);
     }