automake/autoconf fluctuations

diff --git a/config.guess b/config.guess
index 5145e35..fb9a2ba 100644 (file)
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 

-timestamp='2002-10-21'
+timestamp='2002-05-29'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by

@@ -88,40 +88,30 @@ if test $# != 0; then
   exit 1
 fi
 
   exit 1
 fi
 

-trap 'exit 1' 1 2 15

 
 

-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15

 
 

+# CC_FOR_BUILD -- compiler used by this script.

 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 

-# This shell variable is my proudest work .. or something. --bje
-
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;

        for c in cc gcc c89 c99 ; do
        for c in cc gcc c89 c99 ; do

-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+         ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+         if test $? = 0 ; then

             CC_FOR_BUILD="$c"; break ;
          fi ;
        done ;
             CC_FOR_BUILD="$c"; break ;
          fi ;
        done ;

-       rm -f $files ;
+       rm -f $dummy.c $dummy.o $dummy.rel ;

        if test x"$CC_FOR_BUILD" = x ; then
          CC_FOR_BUILD=no_compiler_found ;
        fi
        ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
        if test x"$CC_FOR_BUILD" = x ; then
          CC_FOR_BUILD=no_compiler_found ;
        fi
        ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;

-esac ;
-unset files'
+esac'

 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)

@@ -231,7 +221,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # 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.
        # 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.

-       eval $set_cc_for_build

        cat <<EOF >$dummy.s
        .data
 \$Lformat:
        cat <<EOF >$dummy.s
        .data
 \$Lformat:

@@ -257,9 +246,10 @@ main:
        jsr \$26,exit
        .end main
 EOF
        jsr \$26,exit
        .end main
 EOF

-       $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+       eval $set_cc_for_build
+       $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null

        if test "$?" = 0 ; then
        if test "$?" = 0 ; then

-               case `$dummy` in
+               case `./$dummy` in

                        0-0)
                                UNAME_MACHINE="alpha"
                                ;;
                        0-0)
                                UNAME_MACHINE="alpha"
                                ;;

@@ -281,12 +271,9 @@ EOF
                        2-1307)
                                UNAME_MACHINE="alphaev68"
                                ;;
                        2-1307)
                                UNAME_MACHINE="alphaev68"
                                ;;

-                       3-1307)
-                               UNAME_MACHINE="alphaev7"
-                               ;;

                esac
        fi
                esac
        fi

-       rm -f $dummy.s $dummy && rmdir $tmpdir
+       rm -f $dummy.s $dummy

        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        exit 0 ;;
     Alpha\ *:Windows_NT*:*)
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        exit 0 ;;
     Alpha\ *:Windows_NT*:*)

@@ -327,10 +314,6 @@ EOF
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
        exit 0 ;;
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
        exit 0 ;;

-    DRS?6000:UNIX_SV:4.2*:7*)
-       case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7 && exit 0 ;;
-       esac ;;

     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;

@@ -437,18 +420,15 @@ EOF
          exit (-1);
        }
 EOF
          exit (-1);
        }
 EOF

-       $CC_FOR_BUILD -o $dummy $dummy.c \
-         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-       rm -f $dummy.c $dummy && rmdir $tmpdir
+       $CC_FOR_BUILD $dummy.c -o $dummy \
+         && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+         && rm -f $dummy.c $dummy && exit 0
+       rm -f $dummy.c $dummy

        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
        exit 0 ;;
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
        exit 0 ;;

-    Motorola:*:4.3:PL8-*)
-       echo powerpc-harris-powermax
-       exit 0 ;;

     Night_Hawk:*:*:PowerMAX_OS)
        echo powerpc-harris-powermax
        exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS)
        echo powerpc-harris-powermax
        exit 0 ;;

@@ -524,8 +504,8 @@ EOF
                        exit(0);
                        }
 EOF
                        exit(0);
                        }
 EOF

-               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-               rm -f $dummy.c $dummy && rmdir $tmpdir
+               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+               rm -f $dummy.c $dummy

                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4

@@ -623,9 +603,9 @@ EOF
                   exit (0);
               }
 EOF
                   exit (0);
               }
 EOF

-                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                   (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`

                    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
                    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi

-                   rm -f $dummy.c $dummy && rmdir $tmpdir
+                   rm -f $dummy.c $dummy

                fi ;;
        esac
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
                fi ;;
        esac
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}

@@ -661,8 +641,8 @@ EOF
          exit (0);
        }
 EOF
          exit (0);
        }
 EOF

-       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-       rm -f $dummy.c $dummy && rmdir $tmpdir
+       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+       rm -f $dummy.c $dummy

        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )

@@ -745,19 +725,7 @@ EOF
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        exit 0 ;;
     *:FreeBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        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=`
-       rm -f $dummy.c && rmdir $tmpdir
-       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*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin

@@ -818,7 +786,7 @@ EOF
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`

-       rm -f $dummy.c && rmdir $tmpdir
+       rm -f $dummy.c

        test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
        ;;
     ppc:Linux:*:*)
        test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
        ;;
     ppc:Linux:*:*)

@@ -881,7 +849,7 @@ EOF
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"

-               exit 0 ;;
+               exit 0 ;;               

          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit 0 ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit 0 ;;

@@ -914,7 +882,7 @@ EOF
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`

-       rm -f $dummy.c && rmdir $tmpdir
+       rm -f $dummy.c

        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
        ;;
        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
        ;;

@@ -992,9 +960,6 @@ EOF
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;

-    mc68k:UNIX:SYSTEM5:3.51m)
-       echo m68k-convergent-sysv
-       exit 0 ;;

     M68*:*:R3V[567]*:*)
        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)
     M68*:*:R3V[567]*:*)
        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)

@@ -1088,9 +1053,6 @@ EOF
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
        exit 0 ;;
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
        exit 0 ;;

-    SX-6:SUPER-UX:*:*)
-       echo sx6-nec-superux${UNAME_RELEASE}
-       exit 0 ;;

     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;

@@ -1111,7 +1073,7 @@ EOF
     *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
     *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;

-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)

        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
     *:NonStop-UX:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
     *:NonStop-UX:*:*)

@@ -1283,8 +1245,8 @@ main ()
 }
 EOF
 
 }
 EOF
 

-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy

 
 # Apollos put the system type in the environment.
 
 
 # Apollos put the system type in the environment.
 

diff --git a/config.sub b/config.sub
index 9738dd0..cbb2626 100644 (file)
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 

-timestamp='2002-09-05'
+timestamp='2002-06-21'

 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software

@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in

-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)

     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;

@@ -229,7 +229,7 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | 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 \
        | d10v | d30v | dlx | dsp16xx \
        | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

@@ -239,7 +239,6 @@ case $basic_machine in
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \

-       | mips64vr | mips64vrel \

        | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \

@@ -247,7 +246,6 @@ case $basic_machine in
        | mipsisa32 | mipsisa32el \
        | mipsisa64 | mipsisa64el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa32 | mipsisa32el \
        | mipsisa64 | mipsisa64el \
        | mipsisa64sb1 | mipsisa64sb1el \

-       | mipsisa64sr71k | mipsisa64sr71kel \

        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | ns16k | ns32k \

@@ -294,7 +292,7 @@ case $basic_machine in
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
        | bs2000-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* \
        | bs2000-* \

-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+       | c[123]* | c30-* | [cjt]90-* | c54x-* \

        | clipper-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
        | clipper-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \

@@ -309,7 +307,6 @@ case $basic_machine in
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \

-       | mips64vr-* | mips64vrel-* \

        | mips64orion-* | mips64orionel-* \
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64orion-* | mips64orionel-* \
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \

@@ -317,7 +314,6 @@ case $basic_machine in
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa64-* | mipsisa64el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa64-* | mipsisa64el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \

-       | mipsisa64sr71k-* | mipsisa64sr71kel-* \

        | mipstx39 | mipstx39el \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | mipstx39 | mipstx39el \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \

@@ -329,7 +325,7 @@ case $basic_machine in
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

-       | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+       | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \

        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

@@ -367,9 +363,6 @@ case $basic_machine in
                basic_machine=a29k-none
                os=-bsd
                ;;
                basic_machine=a29k-none
                os=-bsd
                ;;

-       amd64-*)
-               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;

        amdahl)
                basic_machine=580-amdahl
                os=-sysv
        amdahl)
                basic_machine=580-amdahl
                os=-sysv

@@ -752,13 +745,13 @@ case $basic_machine in
        pbb)
                basic_machine=m68k-tti
                ;;
        pbb)
                basic_machine=m68k-tti
                ;;

-       pc532 | pc532-*)
+        pc532 | pc532-*)

                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
                basic_machine=ns32k-pc532
                ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;

-       pentiumpro | p6 | 6x86 | athlon | athlon_*)
+       pentiumpro | p6 | 6x86 | athlon)

                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)
                basic_machine=i686-pc
                ;;
        pentiumii | pentium2)

@@ -779,22 +772,22 @@ case $basic_machine in
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown

-               ;;
+               ;;

        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown

-               ;;
+               ;;

        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown

-               ;;
+               ;;

        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown

-               ;;
+               ;;

        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;

@@ -825,12 +818,6 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
                basic_machine=a29k-amd
                os=-udi
                ;;

-       sb1)
-               basic_machine=mipsisa64sb1-unknown
-               ;;
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;

        sequent)
                basic_machine=i386-sequent
                ;;
        sequent)
                basic_machine=i386-sequent
                ;;

@@ -896,7 +883,7 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;

-       sv1)
+        sv1)

                basic_machine=sv1-cray
                os=-unicos
                ;;
                basic_machine=sv1-cray
                os=-unicos
                ;;

@@ -916,10 +903,6 @@ case $basic_machine in
                basic_machine=t90-cray
                os=-unicos
                ;;
                basic_machine=t90-cray
                os=-unicos
                ;;

-        tic4x | c4x*)
-               basic_machine=tic4x-unknown
-               os=-coff
-               ;;

        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff

@@ -958,8 +941,8 @@ case $basic_machine in
                os=-vms
                ;;
        vpp*|vx|vx-*)
                os=-vms
                ;;
        vpp*|vx|vx-*)

-               basic_machine=f301-fujitsu
-               ;;
+               basic_machine=f301-fujitsu
+               ;;

        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks

@@ -984,7 +967,7 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-windows32-msvcrt
                ;;
                basic_machine=i386-pc
                os=-windows32-msvcrt
                ;;

-       xps | xps100)
+        xps | xps100)

                basic_machine=xps100-honeywell
                ;;
        ymp)
                basic_machine=xps100-honeywell
                ;;
        ymp)

@@ -1039,7 +1022,7 @@ case $basic_machine in
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;

-       cydra)
+        cydra)

                basic_machine=cydra-cydrome
                ;;
        orion)
                basic_machine=cydra-cydrome
                ;;
        orion)

@@ -1054,6 +1037,10 @@ case $basic_machine in
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;

+       c4x*)
+               basic_machine=c4x-none
+               os=-coff
+               ;;

        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;
        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;

@@ -1185,7 +1172,7 @@ case $os in
                os=-rtmk-nova
                ;;
        -ns2 )
                os=-rtmk-nova
                ;;
        -ns2 )

-               os=-nextstep2
+               os=-nextstep2

                ;;
        -nsk*)
                os=-nsk
                ;;
        -nsk*)
                os=-nsk

@@ -1224,8 +1211,8 @@ case $os in
        -xenix)
                os=-xenix
                ;;
        -xenix)
                os=-xenix
                ;;

-       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint

                ;;
        -none)
                ;;
                ;;
        -none)
                ;;

@@ -1262,7 +1249,7 @@ case $basic_machine in
        pdp10-*)
                os=-tops20
                ;;
        pdp10-*)
                os=-tops20
                ;;

-       pdp11-*)
+        pdp11-*)

                os=-none
                ;;
        *-dec | vax-*)
                os=-none
                ;;
        *-dec | vax-*)

@@ -1355,19 +1342,19 @@ case $basic_machine in
        *-next)
                os=-nextstep3
                ;;
        *-next)
                os=-nextstep3
                ;;

-       *-gould)
+        *-gould)

                os=-sysv
                ;;
                os=-sysv
                ;;

-       *-highlevel)
+        *-highlevel)

                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;

-       *-sgi)
+        *-sgi)

                os=-irix
                ;;
                os=-irix
                ;;

-       *-siemens)
+        *-siemens)

                os=-sysv4
                ;;
        *-masscomp)
                os=-sysv4
                ;;
        *-masscomp)

diff --git a/install-sh b/install-sh
index e9de238..c122ef9 100755 (executable)
--- a/install-sh
+++ b/install-sh
@@ -163,7 +163,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then

-defaultIFS='   
+defaultIFS='   

 '
 IFS="${IFS-${defaultIFS}}"
 
 '
 IFS="${IFS-${defaultIFS}}"
 

diff --git a/ltmain.sh b/ltmain.sh
index dbb5277..46a9450 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -48,9 +48,6 @@ EOF
   exit 0
 fi
 
   exit 0
 fi
 

-# define SED for historic ltconfig's generated by Libtool 1.3
-test -z "$SED" && SED=sed
-

 # The name of this program.
 progname=`$echo "$0" | ${SED} 's%^.*/%%'`
 modename="$progname"
 # The name of this program.
 progname=`$echo "$0" | ${SED} 's%^.*/%%'`
 modename="$progname"

@@ -58,8 +55,8 @@ modename="$progname"
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool

-VERSION=1.4.3
-TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
+VERSION=1.4.2a
+TIMESTAMP=" (1.922.2.100 2002/06/26 07:25:14)"

 
 default_mode=
 help="Try \`$progname --help' for more information."
 
 default_mode=
 help="Try \`$progname --help' for more information."

@@ -229,7 +226,7 @@ if test -z "$show_help"; then
   # Infer the operation mode.
   if test -z "$mode"; then
     case $nonopt in
   # Infer the operation mode.
   if test -z "$mode"; then
     case $nonopt in

-    *cc | *++ | gcc* | *-gcc* | xlc*)
+    *cc | *++ | gcc* | *-gcc*)

       mode=link
       for arg
       do
       mode=link
       for arg
       do

@@ -902,7 +899,7 @@ compiler."
          prev=
          continue
          ;;
          prev=
          continue
          ;;

-        inst_prefix)
+       inst_prefix)

          inst_prefix_dir="$arg"
          prev=
          continue
          inst_prefix_dir="$arg"
          prev=
          continue

@@ -1009,9 +1006,9 @@ compiler."
        ;;
 
       -inst-prefix-dir)
        ;;
 
       -inst-prefix-dir)

-       prev=inst_prefix
-       continue
-       ;;
+       prev=inst_prefix
+       continue
+       ;;

 
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
 
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L

@@ -1214,11 +1211,6 @@ compiler."
        continue
        ;;
 
        continue
        ;;
 

-      -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-

       # Some other compiler flag.
       -* | +*)
        # Unknown arguments in both finalize_command and compile_command need
       # Some other compiler flag.
       -* | +*)
        # Unknown arguments in both finalize_command and compile_command need

@@ -1398,7 +1390,7 @@ compiler."
        ;;
     esac
     for pass in $passes; do
        ;;
     esac
     for pass in $passes; do

-      if test "$linkmode" = prog; then
+      if test $linkmode = prog; then

        # Determine which files to process
        case $pass in
        dlopen)
        # Determine which files to process
        case $pass in
        dlopen)

@@ -1415,11 +1407,11 @@ compiler."
        found=no
        case $deplib in
        -l*)
        found=no
        case $deplib in
        -l*)

-         if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+         if test $linkmode = oldlib && test $linkmode = obj; then

            $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
            continue
          fi
            $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
            continue
          fi

-         if test "$pass" = conv; then
+         if test $pass = conv; then

            deplibs="$deplib $deplibs"
            continue
          fi
            deplibs="$deplib $deplibs"
            continue
          fi

@@ -1439,7 +1431,7 @@ compiler."
              finalize_deplibs="$deplib $finalize_deplibs"
            else
              deplibs="$deplib $deplibs"
              finalize_deplibs="$deplib $finalize_deplibs"
            else
              deplibs="$deplib $deplibs"

-             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+             test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"

            fi
            continue
          fi
            fi
            continue
          fi

@@ -1448,16 +1440,16 @@ compiler."
          case $linkmode in
          lib)
            deplibs="$deplib $deplibs"
          case $linkmode in
          lib)
            deplibs="$deplib $deplibs"

-           test "$pass" = conv && continue
+           test $pass = conv && continue

            newdependency_libs="$deplib $newdependency_libs"
            newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
            ;;
          prog)
            newdependency_libs="$deplib $newdependency_libs"
            newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
            ;;
          prog)

-           if test "$pass" = conv; then
+           if test $pass = conv; then

              deplibs="$deplib $deplibs"
              continue
            fi
              deplibs="$deplib $deplibs"
              continue
            fi

-           if test "$pass" = scan; then
+           if test $pass = scan; then

              deplibs="$deplib $deplibs"
              newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
            else
              deplibs="$deplib $deplibs"
              newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
            else

@@ -1472,7 +1464,7 @@ compiler."
          continue
          ;; # -L
        -R*)
          continue
          ;; # -L
        -R*)

-         if test "$pass" = link; then
+         if test $pass = link; then

            dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
            # Make sure the xrpath contains only unique directories.
            case "$xrpath " in
            dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
            # Make sure the xrpath contains only unique directories.
            case "$xrpath " in

@@ -1485,7 +1477,7 @@ compiler."
          ;;
        *.la) lib="$deplib" ;;
        *.$libext)
          ;;
        *.la) lib="$deplib" ;;
        *.$libext)

-         if test "$pass" = conv; then
+         if test $pass = conv; then

            deplibs="$deplib $deplibs"
            continue
          fi
            deplibs="$deplib $deplibs"
            continue
          fi

@@ -1508,7 +1500,7 @@ compiler."
            continue
            ;;
          prog)
            continue
            ;;
          prog)

-           if test "$pass" != link; then
+           if test $pass != link; then

              deplibs="$deplib $deplibs"
            else
              compile_deplibs="$deplib $compile_deplibs"
              deplibs="$deplib $deplibs"
            else
              compile_deplibs="$deplib $compile_deplibs"

@@ -1519,7 +1511,7 @@ compiler."
          esac # linkmode
          ;; # *.$libext
        *.lo | *.$objext)
          esac # linkmode
          ;; # *.$libext
        *.lo | *.$objext)

-         if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+         if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then

            # If there is no dlopen support or we're linking statically,
            # we need to preload.
            newdlprefiles="$newdlprefiles $deplib"
            # If there is no dlopen support or we're linking statically,
            # we need to preload.
            newdlprefiles="$newdlprefiles $deplib"

@@ -1535,7 +1527,7 @@ compiler."
          continue
          ;;
        esac # case $deplib
          continue
          ;;
        esac # case $deplib

-       if test "$found" = yes || test -f "$lib"; then :
+       if test $found = yes || test -f "$lib"; then :

        else
          $echo "$modename: cannot find the library \`$lib'" 1>&2
          exit 1
        else
          $echo "$modename: cannot find the library \`$lib'" 1>&2
          exit 1

@@ -1569,13 +1561,13 @@ compiler."
 
        if test "$linkmode,$pass" = "lib,link" ||
           test "$linkmode,$pass" = "prog,scan" ||
 
        if test "$linkmode,$pass" = "lib,link" ||
           test "$linkmode,$pass" = "prog,scan" ||

-          { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+          { test $linkmode = oldlib && test $linkmode = obj; }; then

           # Add dl[pre]opened files of deplib
          test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
          test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
        fi
 
           # Add dl[pre]opened files of deplib
          test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
          test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
        fi
 

-       if test "$pass" = conv; then
+       if test $pass = conv; then

          # Only check for convenience libraries
          deplibs="$lib $deplibs"
          if test -z "$libdir"; then
          # Only check for convenience libraries
          deplibs="$lib $deplibs"
          if test -z "$libdir"; then

@@ -1596,7 +1588,7 @@ compiler."
               fi
              tmp_libs="$tmp_libs $deplib"
            done
               fi
              tmp_libs="$tmp_libs $deplib"
            done

-         elif test "$linkmode" != prog && test "$linkmode" != lib; then
+         elif test $linkmode != prog && test $linkmode != lib; then

            $echo "$modename: \`$lib' is not a convenience library" 1>&2
            exit 1
          fi
            $echo "$modename: \`$lib' is not a convenience library" 1>&2
            exit 1
          fi

@@ -1614,7 +1606,7 @@ compiler."
        fi
 
        # This library was specified with -dlopen.
        fi
 
        # This library was specified with -dlopen.

-       if test "$pass" = dlopen; then
+       if test $pass = dlopen; then

          if test -z "$libdir"; then
            $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
            exit 1
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
            exit 1

@@ -1663,7 +1655,7 @@ compiler."
        name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
        # This library was specified with -dlpreopen.
        name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
        # This library was specified with -dlpreopen.

-       if test "$pass" = dlpreopen; then
+       if test $pass = dlpreopen; then

          if test -z "$libdir"; then
            $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
            exit 1
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
            exit 1

@@ -1682,7 +1674,7 @@ compiler."
 
        if test -z "$libdir"; then
          # Link the convenience library
 
        if test -z "$libdir"; then
          # Link the convenience library

-         if test "$linkmode" = lib; then
+         if test $linkmode = lib; then

            deplibs="$dir/$old_library $deplibs"
          elif test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$dir/$old_library $compile_deplibs"
            deplibs="$dir/$old_library $deplibs"
          elif test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$dir/$old_library $compile_deplibs"

@@ -1693,7 +1685,7 @@ compiler."
          continue
        fi
 
          continue
        fi
 

-       if test "$linkmode" = prog && test "$pass" != link; then
+       if test $linkmode = prog && test $pass != link; then

          newlib_search_path="$newlib_search_path $ladir"
          deplibs="$lib $deplibs"
 
          newlib_search_path="$newlib_search_path $ladir"
          deplibs="$lib $deplibs"
 

@@ -1709,7 +1701,7 @@ compiler."
            -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
            esac
            # Need to link against all dependency_libs?
            -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
            esac
            # Need to link against all dependency_libs?

-           if test "$linkalldeplibs" = yes; then
+           if test $linkalldeplibs = yes; then

              deplibs="$deplib $deplibs"
            else
              # Need to hardcode shared library paths
              deplibs="$deplib $deplibs"
            else
              # Need to hardcode shared library paths

@@ -1732,7 +1724,7 @@ compiler."
          # Link against this shared library
 
          if test "$linkmode,$pass" = "prog,link" ||
          # Link against this shared library
 
          if test "$linkmode,$pass" = "prog,link" ||

-          { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+          { test $linkmode = lib && test $hardcode_into_libs = yes; }; then

            # Hardcode the library path.
            # Skip directories that are in the system default run-time
            # search path.
            # Hardcode the library path.
            # Skip directories that are in the system default run-time
            # search path.

@@ -1754,7 +1746,7 @@ compiler."
              esac
              ;;
            esac
              esac
              ;;
            esac

-           if test "$linkmode" = prog; then
+           if test $linkmode = prog; then

              # We need to hardcode the library path
              if test -n "$shlibpath_var"; then
                # Make sure the rpath contains only unique directories.
              # We need to hardcode the library path
              if test -n "$shlibpath_var"; then
                # Make sure the rpath contains only unique directories.

@@ -1838,7 +1830,7 @@ compiler."
            linklib=$newlib
          fi # test -n $old_archive_from_expsyms_cmds
 
            linklib=$newlib
          fi # test -n $old_archive_from_expsyms_cmds
 

-         if test "$linkmode" = prog || test "$mode" != relink; then
+         if test $linkmode = prog || test "$mode" != relink; then

            add_shlibpath=
            add_dir=
            add=
            add_shlibpath=
            add_dir=
            add=

@@ -1865,6 +1857,14 @@ compiler."
                add="$dir/$linklib"
              elif test "$hardcode_minus_L" = yes; then
                add_dir="-L$dir"
                add="$dir/$linklib"
              elif test "$hardcode_minus_L" = yes; then
                add_dir="-L$dir"

+               # Try looking first in the location we're being installed to.
+               if test -n "$inst_prefix_dir"; then
+                 case "$libdir" in
+                 [\/]*)
+                   add_dir="-L$inst_prefix_dir$libdir $add_dir"
+                   ;;
+                 esac
+               fi

                add="-l$name"
              elif test "$hardcode_shlibpath_var" = yes; then
                add_shlibpath="$dir"
                add="-l$name"
              elif test "$hardcode_shlibpath_var" = yes; then
                add_shlibpath="$dir"

@@ -1887,7 +1887,7 @@ compiler."
              *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
              esac
            fi
              *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
              esac
            fi

-           if test "$linkmode" = prog; then
+           if test $linkmode = prog; then

              test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
              test -n "$add" && compile_deplibs="$add $compile_deplibs"
            else
              test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
              test -n "$add" && compile_deplibs="$add $compile_deplibs"
            else

@@ -1904,7 +1904,7 @@ compiler."
            fi
          fi
 
            fi
          fi
 

-         if test "$linkmode" = prog || test "$mode" = relink; then
+         if test $linkmode = prog || test "$mode" = relink; then

            add_shlibpath=
            add_dir=
            add=
            add_shlibpath=
            add_dir=
            add=

@@ -1912,16 +1912,7 @@ compiler."
            if test "$hardcode_direct" = yes; then
              add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then
            if test "$hardcode_direct" = yes; then
              add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then

-             # Try looking first in the location we're being installed to.
-             add_dir=
-             if test -n "$inst_prefix_dir"; then
-               case "$libdir" in
-               [\\/]*)
-                 add_dir="-L$inst_prefix_dir$libdir"
-                 ;;
-               esac
-             fi
-             add_dir="$add_dir -L$libdir"
+             add_dir="-L$libdir"

              add="-l$name"
            elif test "$hardcode_shlibpath_var" = yes; then
              case :$finalize_shlibpath: in
              add="-l$name"
            elif test "$hardcode_shlibpath_var" = yes; then
              case :$finalize_shlibpath: in

@@ -1931,20 +1922,19 @@ compiler."
              add="-l$name"
            else
              # We cannot seem to hardcode it, guess we'll fake it.
              add="-l$name"
            else
              # We cannot seem to hardcode it, guess we'll fake it.

+             add_dir="-L$libdir"

              # Try looking first in the location we're being installed to.
              # Try looking first in the location we're being installed to.

-             add_dir=

              if test -n "$inst_prefix_dir"; then
                case "$libdir" in
              if test -n "$inst_prefix_dir"; then
                case "$libdir" in

-               [\\/]*)
-                 add_dir="-L$inst_prefix_dir$libdir"
+               [\/]*)
+                 add_dir="-L$inst_prefix_dir$libdir $add_dir"

                  ;;
                esac
              fi
                  ;;
                esac
              fi

-             add_dir="$add_dir -L$libdir"

              add="-l$name"
            fi
 
              add="-l$name"
            fi
 

-           if test "$linkmode" = prog; then
+           if test $linkmode = prog; then

              test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
              test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
            else
              test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
              test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
            else

@@ -1952,7 +1942,7 @@ compiler."
              test -n "$add" && deplibs="$add $deplibs"
            fi
          fi
              test -n "$add" && deplibs="$add $deplibs"
            fi
          fi

-       elif test "$linkmode" = prog; then
+       elif test $linkmode = prog; then

          if test "$alldeplibs" = yes &&
             { test "$deplibs_check_method" = pass_all ||
               { test "$build_libtool_libs" = yes &&
          if test "$alldeplibs" = yes &&
             { test "$deplibs_check_method" = pass_all ||
               { test "$build_libtool_libs" = yes &&

@@ -2012,10 +2002,10 @@ compiler."
          fi
        fi # link shared/static library?
 
          fi
        fi # link shared/static library?
 

-       if test "$linkmode" = lib; then
+       if test $linkmode = lib; then

          if test -n "$dependency_libs" &&
          if test -n "$dependency_libs" &&

-            { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-              test "$link_static" = yes; }; then
+            { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+              test $link_static = yes; }; then

            # Extract -R from dependency_libs
            temp_deplibs=
            for libdir in $dependency_libs; do
            # Extract -R from dependency_libs
            temp_deplibs=
            for libdir in $dependency_libs; do

@@ -2046,7 +2036,7 @@ compiler."
            tmp_libs="$tmp_libs $deplib"
          done
 
            tmp_libs="$tmp_libs $deplib"
          done
 

-         if test "$link_all_deplibs" != no; then
+         if test $link_all_deplibs != no; then

            # Add the search paths of all dependency libraries
            for deplib in $dependency_libs; do
              case $deplib in
            # Add the search paths of all dependency libraries
            for deplib in $dependency_libs; do
              case $deplib in

@@ -2089,15 +2079,15 @@ compiler."
          fi # link_all_deplibs != no
        fi # linkmode = lib
       done # for deplib in $libs
          fi # link_all_deplibs != no
        fi # linkmode = lib
       done # for deplib in $libs

-      if test "$pass" = dlpreopen; then
+      if test $pass = dlpreopen; then

        # Link the dlpreopened libraries before other libraries
        for deplib in $save_deplibs; do
          deplibs="$deplib $deplibs"
        done
       fi
        # Link the dlpreopened libraries before other libraries
        for deplib in $save_deplibs; do
          deplibs="$deplib $deplibs"
        done
       fi

-      if test "$pass" != dlopen; then
-       test "$pass" != scan && dependency_libs="$newdependency_libs"
-       if test "$pass" != conv; then
+      if test $pass != dlopen; then
+       test $pass != scan && dependency_libs="$newdependency_libs"
+       if test $pass != conv; then

          # Make sure lib_search_path contains only unique directories.
          lib_search_path=
          for dir in $newlib_search_path; do
          # Make sure lib_search_path contains only unique directories.
          lib_search_path=
          for dir in $newlib_search_path; do

@@ -2155,7 +2145,7 @@ compiler."
        deplibs=
       fi
     done # for pass
        deplibs=
       fi
     done # for pass

-    if test "$linkmode" = prog; then
+    if test $linkmode = prog; then

       dlfiles="$newdlfiles"
       dlprefiles="$newdlprefiles"
     fi
       dlfiles="$newdlfiles"
       dlprefiles="$newdlprefiles"
     fi

@@ -2273,7 +2263,7 @@ compiler."
 
        # Check that each of the things are valid numbers.
        case $current in
 
        # Check that each of the things are valid numbers.
        case $current in

-       [0-9]*) ;;
+       0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;

        *)
          $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
        *)
          $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2

@@ -2282,7 +2272,7 @@ compiler."
        esac
 
        case $revision in
        esac
 
        case $revision in

-       [0-9]*) ;;
+       0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;

        *)
          $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
        *)
          $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2

@@ -2291,7 +2281,7 @@ compiler."
        esac
 
        case $age in
        esac
 
        case $age in

-       [0-9]*) ;;
+       0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;

        *)
          $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
        *)
          $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2

@@ -2360,7 +2350,7 @@ compiler."
          ;;
 
        osf)
          ;;
 
        osf)

-         major=.`expr $current - $age`
+         major=`expr $current - $age`

          versuffix=".$current.$age.$revision"
          verstring="$current.$age.$revision"
 
          versuffix=".$current.$age.$revision"
          verstring="$current.$age.$revision"
 

@@ -2467,7 +2457,7 @@ compiler."
          *) finalize_rpath="$finalize_rpath $libdir" ;;
          esac
        done
          *) finalize_rpath="$finalize_rpath $libdir" ;;
          esac
        done

-       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+       if test $hardcode_into_libs != yes || test $build_old_libs = yes; then

          dependency_libs="$temp_xrpath $dependency_libs"
        fi
       fi
          dependency_libs="$temp_xrpath $dependency_libs"
        fi
       fi

@@ -2510,7 +2500,7 @@ compiler."
            ;;
          *)
            # Add libc to deplibs on all other systems if necessary.
            ;;
          *)
            # Add libc to deplibs on all other systems if necessary.

-           if test "$build_libtool_need_lc" = "yes"; then
+           if test $build_libtool_need_lc = "yes"; then

              deplibs="$deplibs -lc"
            fi
            ;;
              deplibs="$deplibs -lc"
            fi
            ;;

@@ -2648,13 +2638,6 @@ EOF
                        *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                        esac
                      done
                        *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                        esac
                      done

-                     # It is ok to link against an archive when
-                     # building a shared library.
-                     if $AR -t $potlib > /dev/null 2>&1; then
-                       newdeplibs="$newdeplibs $a_deplib"
-                       a_deplib=""
-                       break 2
-                     fi

                      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
                         | ${SED} 10q \
                         | egrep "$file_magic_regex" > /dev/null; then
                      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
                         | ${SED} 10q \
                         | egrep "$file_magic_regex" > /dev/null; then

@@ -2782,7 +2765,7 @@ EOF
            echo "*** automatically added whenever a program is linked with this library"
            echo "*** or is declared to -dlopen it."
 
            echo "*** automatically added whenever a program is linked with this library"
            echo "*** or is declared to -dlopen it."
 

-           if test "$allow_undefined" = no; then
+           if test $allow_undefined = no; then

              echo
              echo "*** Since this library must not contain undefined symbols,"
              echo "*** because either the platform does not support them or"
              echo
              echo "*** Since this library must not contain undefined symbols,"
              echo "*** because either the platform does not support them or"

@@ -2809,7 +2792,7 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then

-       if test "$hardcode_into_libs" = yes; then
+       if test $hardcode_into_libs = yes; then

          # Hardcode the library paths
          hardcode_libdirs=
          dep_rpath=
          # Hardcode the library paths
          hardcode_libdirs=
          dep_rpath=

@@ -3216,13 +3199,6 @@ EOF
        # On Rhapsody replace the C library is the System framework
        compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
        finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
        # On Rhapsody replace the C library is the System framework
        compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
        finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`

-       case $host in
-       *darwin*)
-         # Don't allow lazy linking, it breaks C++ global constructors
-         compile_command="$compile_command ${wl}-bind_at_load"
-         finalize_command="$finalize_command ${wl}-bind_at_load"
-         ;;
-       esac

        ;;
       esac
 
        ;;
       esac
 

@@ -3517,7 +3493,7 @@ static const void *lt_preloaded_setup() {
        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 

-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+      if test $need_relink = no || test "$build_libtool_libs" != yes; then

        # Replace the output file specification.
        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
        link_command="$compile_command$compile_rpath"
        # Replace the output file specification.
        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
        link_command="$compile_command$compile_rpath"

@@ -3994,46 +3970,9 @@ fi\
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit 1
                fi
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit 1
                fi

-               # We do not want portage's install root ($D) present.  Check only for
-               # this if the .la is being installed.
-               if test "$installed" = yes && test "$D"; then
-                 eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
-               else
-                 mynewdependency_lib="$libdir/$name"
-               fi
-               # Do not add duplicates
-               if test "$mynewdependency_lib"; then
-                 if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
-                   newdependency_libs="$newdependency_libs $mynewdependency_lib"
-                 fi
-               fi
-               ;;
-                 *)
-               if test "$installed" = yes; then
-         # Rather use S=WORKDIR if our version of portage supports it.
-         # This is because some ebuild (gcc) do not use $S as buildroot.
-                 if test "$PWORKDIR"; then
-                   S="$PWORKDIR"
-                 fi
-                 # We do not want portage's build root ($S) present.
-                 if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
-                   mynewdependency_lib=""
-                 # We do not want portage's install root ($D) present.
-                 elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
-                   eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
-                 else
-                   mynewdependency_lib="$deplib"
-                 fi
-               else
-                 mynewdependency_lib="$deplib"
-               fi
-               # Do not add duplicates
-               if test "$mynewdependency_lib"; then
-                 if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
-                       newdependency_libs="$newdependency_libs $mynewdependency_lib"
-                 fi
-               fi
+               newdependency_libs="$newdependency_libs $libdir/$name"

                ;;
                ;;

+             *) newdependency_libs="$newdependency_libs $deplib" ;;

              esac
            done
            dependency_libs="$newdependency_libs"
              esac
            done
            dependency_libs="$newdependency_libs"

@@ -4066,10 +4005,6 @@ fi\
          case $host,$output,$installed,$module,$dlname in
            *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
          esac
          case $host,$output,$installed,$module,$dlname in
            *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
          esac

-         # Do not add duplicates
-         if test "$installed" = yes && test "$D"; then
-           install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
-         fi

          $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
          $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP

@@ -4103,7 +4038,7 @@ dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"

-         if test "$installed" = no && test "$need_relink" = yes; then
+         if test "$installed" = no && test $need_relink = yes; then

            $echo >> $output "\
 relink_command=\"$relink_command\""
          fi
            $echo >> $output "\
 relink_command=\"$relink_command\""
          fi

@@ -4314,25 +4249,25 @@ relink_command=\"$relink_command\""
        dir="$dir$objdir"
 
        if test -n "$relink_command"; then
        dir="$dir$objdir"
 
        if test -n "$relink_command"; then

-         # Determine the prefix the user has applied to our future dir.
-         inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-
-         # Don't allow the user to place us outside of our expected
-         # location b/c this prevents finding dependent libraries that
-         # are installed to the same prefix.
-         if test "$inst_prefix_dir" = "$destdir"; then
-           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-           exit 1
-         fi
-
-         if test -n "$inst_prefix_dir"; then
-           # Stick the inst_prefix_dir data into the link command.
-           relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-         else
-           relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-         fi
-
-         $echo "$modename: warning: relinking \`$file'" 1>&2
+          # Determine the prefix the user has applied to our future dir.
+          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+ 
+          # Don't allow the user to place us outside of our expected
+          # location b/c this prevents finding dependent libraries that
+          # are installed to the same prefix.
+          if test "$inst_prefix_dir" = "$destdir"; then
+            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+            exit 1
+          fi
+ 
+          if test -n "$inst_prefix_dir"; then
+            # Stick the inst_prefix_dir data into the link command.
+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+          else
+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+          fi
+
+         $echo "$modename: warning: relinking \`$file'" 1>&2

          $show "$relink_command"
          if $run eval "$relink_command"; then :
          else
          $show "$relink_command"
          if $run eval "$relink_command"; then :
          else

@@ -4500,11 +4435,7 @@ relink_command=\"$relink_command\""
            if test "$finalize" = yes && test -z "$run"; then
              tmpdir="/tmp"
              test -n "$TMPDIR" && tmpdir="$TMPDIR"
            if test "$finalize" = yes && test -z "$run"; then
              tmpdir="/tmp"
              test -n "$TMPDIR" && tmpdir="$TMPDIR"

-              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-              if test $? = 0 ; then :
-              else
-                tmpdir="$tmpdir/libtool-$$"
-              fi
+             tmpdir="$tmpdir/libtool-$$"

              if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
              else
                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
              if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
              else
                $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2

@@ -4845,10 +4776,10 @@ relink_command=\"$relink_command\""
        objdir="$dir/$objdir"
       fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
        objdir="$dir/$objdir"
       fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`

-      test "$mode" = uninstall && objdir="$dir"
+      test $mode = uninstall && objdir="$dir"

 
       # Remember objdir for removal later, being careful to avoid duplicates
 
       # Remember objdir for removal later, being careful to avoid duplicates

-      if test "$mode" = clean; then
+      if test $mode = clean; then

        case " $rmdirs " in
          *" $objdir "*) ;;
          *) rmdirs="$rmdirs $objdir" ;;
        case " $rmdirs " in
          *" $objdir "*) ;;
          *) rmdirs="$rmdirs $objdir" ;;

@@ -4880,9 +4811,9 @@ relink_command=\"$relink_command\""
            rmfiles="$rmfiles $objdir/$n"
          done
          test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
            rmfiles="$rmfiles $objdir/$n"
          done
          test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"

-         test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+         test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"

 
 

-         if test "$mode" = uninstall; then
+         if test $mode = uninstall; then

            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
              eval cmds=\"$postuninstall_cmds\"
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
              eval cmds=\"$postuninstall_cmds\"

@@ -4926,7 +4857,7 @@ relink_command=\"$relink_command\""
 
       *)
        # Do a test to see if this is a libtool program.
 
       *)
        # Do a test to see if this is a libtool program.

-       if test "$mode" = clean &&
+       if test $mode = clean &&

           (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
          relink_command=
          . $dir/$file
           (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
          relink_command=
          . $dir/$file