Changeset 4665 for trunk/admin

Timestamp:

10/02/06 06:56:29 (2 years ago)

Author:

erijo

Message:

Updated libtool, automake and gettext files

Location:

trunk/admin

Files:

• config.guess (modified) (10 diffs)
• config.rpath (modified) (19 diffs)
• config.sub (modified) (17 diffs)
• install-sh (modified) (10 diffs)
• libtool.m4.in (modified) (21 diffs)
• ltmain.sh (modified) (3 diffs)
• missing (modified) (4 diffs)

trunk/admin/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, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-12-13'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -107 +108 @@
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$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 ; } ||
@@ -207 +208 @@
     echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
     exit ;;
+    *:SolidBSD:*:*)
+    echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+    exit ;;
     macppc:MirBSD:*:*)
-    echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+    echo powerpc-unknown-mirbsd${UNAME_RELEASE}
     exit ;;
     *:MirBSD:*:*)
@@ -765 +769 @@
     exit ;;
     *:FreeBSD:*:*)
-    echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+    case ${UNAME_MACHINE} in
+        pc98)
+        echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        amd64)
+        echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        *)
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+    esac
     exit ;;
     i*:CYGWIN*:*)
@@ -780 +791 @@
     echo ${UNAME_MACHINE}-pc-pw32
     exit ;;
-    x86:Interix*:[345]*)
-    echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+    echo i586-pc-interix${UNAME_RELEASE}
+    exit ;;
+    EM64T:Interix*:[3456]*)
+    echo x86_64-unknown-interix${UNAME_RELEASE}
     exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -816 +830 @@
     exit ;;
     arm*:Linux:*:*)
+    echo ${UNAME_MACHINE}-unknown-linux-gnu
+    exit ;;
+    avr32*:Linux:*:*)
     echo ${UNAME_MACHINE}-unknown-linux-gnu
     exit ;;
@@ -852 +869 @@
     #endif
 EOF
-    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+        /^CPU/{
+        s: ::g
+        p
+        }'`"
     test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
     ;;
@@ -871 +892 @@
     #endif
 EOF
-    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+        /^CPU/{
+        s: ::g
+        p
+        }'`"
     test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
     ;;
@@ -968 +993 @@
     # endif
     #else
-    #if defined(__INTEL_COMPILER) || defined(__PGI)
+    #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
     LIBC=gnu
     #else
@@ -978 +1003 @@
     #endif
 EOF
-    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+    eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+        /^LIBC/{
+        s: ::g
+        p
+        }'`"
     test x"${LIBC}" != x && {
         echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

trunk/admin/config.rpath

@@ -3 +3 @@
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Copyright 1996-2006 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -26 +26 @@
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
@@ -36 +36 @@
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
@@ -49 +59 @@
       ;;
     darwin*)
-      case "$cc_basename" in
+      case $cc_basename in
         xlc*)
           wl='-Wl,'
@@ -78 +88 @@
         como)
           wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
           ;;
       esac
@@ -121 +138 @@
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
@@ -128 +149 @@
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
     aix3* | aix4* | aix5*)
@@ -163 +190 @@
       fi
       ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     netbsd*)
       ;;
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
@@ -174 +212 @@
       fi
       ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
-      ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
       ;;
     *)
@@ -192 +237 @@
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
@@ -226 +269 @@
             fi
           done
+          ;;
         esac
       fi
@@ -245 +289 @@
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
@@ -292 +337 @@
         :
       else
-        case "$cc_basename" in
+        case $cc_basename in
           xlc*)
             ;;
@@ -327 +372 @@
       hardcode_minus_L=yes
       ;;
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$with_gnu_ld" = no; then
-        case "$host_cpu" in
-          hppa*64*)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
             hardcode_direct=no
             ;;
-          ia64*)
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_direct=no
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
-            ;;
           *)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
             hardcode_direct=yes
             # hardcode_minus_L: Not really in the search PATH,
@@ -398 +444 @@
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
@@ -428 +472 @@
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
       ;;
     uts4*)
@@ -472 +513 @@
   kfreebsd*-gnu)
     ;;
-  freebsd*)
+  freebsd* | dragonfly*)
     ;;
   gnu*)
     ;;
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
+    case $host_cpu in
       ia64*)
         shrext=.so
@@ -488 +529 @@
         ;;
     esac
+    ;;
+  interix3*)
     ;;
   irix5* | irix6* | nonstopux*)
@@ -524 +567 @@
   osf3* | osf4* | osf5*)
     ;;
-  sco3.2v5*)
-    ;;
   solaris*)
     ;;
   sunos4*)
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  sysv4 | sysv4.3*)
     ;;
   sysv4*MP*)
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
     ;;
   uts4*)

trunk/admin/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-12-11'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
@@ -241 +242 @@
     | 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 \
+    | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
     | bfin \
     | c4x | clipper \
@@ -249 +250 @@
     | i370 | i860 | i960 | ia64 \
     | ip2k | iq2000 \
-    | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+    | m32c | m32r | m32rle | m68000 | m68k | m88k \
+    | maxq | mb | microblaze | mcore \
     | mips | mipsbe | mipseb | mipsel | mipsle \
     | mips16 \
@@ -269 +271 @@
     | mt \
     | msp430 \
+    | nios | nios2 \
     | ns16k | ns32k \
     | or32 \
@@ -274 +277 @@
     | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
     | pyramid \
-    | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+    | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     | sh64 | sh64le \
-    | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-    | sparcv8 | sparcv9 | sparcv9b \
-    | strongarm \
+    | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+    | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+    | spu | strongarm \
     | tahoe | thumb | tic4x | tic80 | tron \
     | v850 | v850e \
@@ -284 +287 @@
     | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
     | z8k)
-        basic_machine=$basic_machine-unknown
-        ;;
-    m32c)
         basic_machine=$basic_machine-unknown
         ;;
@@ -318 +318 @@
     | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
     | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-    | avr-* \
+    | avr-* | avr32-* \
     | bfin-* | bs2000-* \
     | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
@@ -329 +329 @@
     | i*86-* | i860-* | i960-* | ia64-* \
     | ip2k-* | iq2000-* \
-    | m32r-* | m32rle-* \
+    | m32c-* | m32r-* | m32rle-* \
     | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
     | m88110-* | m88k-* | maxq-* | mcore-* \
@@ -351 +351 @@
     | mt-* \
     | msp430-* \
+    | nios-* | nios2-* \
     | none-* | np1-* | ns16k-* | ns32k-* \
     | orion-* \
@@ -357 +358 @@
     | pyramid-* \
     | romp-* | rs6000-* \
-    | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+    | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-    | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+    | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
     | sparclite-* \
-    | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+    | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
     | tahoe-* | thumb-* \
     | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -371 +372 @@
     | ymp-* \
     | z8k-*)
-        ;;
-    m32c-*)
         ;;
     # Recognize the various machine names and aliases which stand
@@ -819 +818 @@
         basic_machine=ns32k-pc532
         ;;
+    pc98)
+        basic_machine=i386-pc
+        ;;
+    pc98-*)
+        basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ;;
     pentium | p5 | k5 | k6 | nexgen | viac3)
         basic_machine=i586-pc
@@ -1121 +1126 @@
         basic_machine=sh-unknown
         ;;
-    sparc | sparcv8 | sparcv9 | sparcv9b)
+    sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
         basic_machine=sparc-sun
         ;;
@@ -1194 +1199 @@
           | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
           | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+          | -openbsd* | -solidbsd* \
           | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
           | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1209 +1215 @@
           | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
           | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-          | -skyos* | -haiku* | -rdos*)
+          | -skyos* | -haiku* | -rdos* | -toppers*)
     # Remember, each alternative MUST END IN *, to match a version number.
         ;;
@@ -1361 +1367 @@
 
 case $basic_machine in
+        spu-*)
+        os=-elf
+        ;;
     *-acorn)
         os=-riscix1.2
@@ -1370 +1379 @@
         os=-aout
         ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+            os=-coff
+        ;;
     # This must come before the *-dec entry.
     pdp10-*)

trunk/admin/install-sh

@@ -2 +2 @@
 # install - install a program, script, or datafile
 
-scriptversion=2005-11-07.23
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
@@ -59 +59 @@
 mkdirprog="${MKDIRPROG-mkdir}"
 
-posix_glob=
-posix_mkdir=
-
-# Symbolic mode for testing mkdir with directories.
-# It is the same as 755, but also tests that "u+" works.
-test_mode=u=rwx,g=rx,o=rx,u+wx
-
-# Desired mode of installed file.
-mode=0755
-
-# Desired mode of newly created intermediate directories.
-# It is empty if not known yet.
-intermediate_mode=
-
-chmodcmd=$chmodprog
+chmodcmd="$chmodprog 0755"
 chowncmd=
 chgrpcmd=
@@ -126 +112 @@
     --help) echo "$usage"; exit $?;;
 
-    -m) mode=$2
+    -m) chmodcmd="$chmodprog $2"
         shift
         shift
@@ -179 +165 @@
 fi
 
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-
 for src
 do
@@ -190 +174 @@
   if test -n "$dir_arg"; then
     dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
   else
-
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
@@ -221 +209 @@
     exit 1
       fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-    (dirname "$dst") 2>/dev/null ||
-    expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$dst" : 'X\(//\)[^/]' \| \
-         X"$dst" : 'X\(//\)$' \| \
-         X"$dst" : 'X\(/\)' \| \
-         .       : '\(.\)' 2>/dev/null ||
-    echo X"$dst" |
-        sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-          /^X\(\/\/\)$/{ s//\1/; q; }
-          /^X\(\/\).*/{ s//\1/; q; }
-          s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
+      dst=$dst/`basename "$src"`
     fi
   fi
 
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-    posix_mkdir=false
-    if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
-      posix_mkdir=true
-    else
-      # Remove any dirs left behind by ancient mkdir implementations.
-      rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
-    fi ;;
-    esac
-
-    if
-      $posix_mkdir && {
-
-    # With -d, create the new directory with the user-specified mode.
-    # Otherwise, create it using the same intermediate mode that
-    # mkdir -p would use when creating intermediate directories.
-    # POSIX says that this mode is "$(umask -S),u+wx", so use that
-    # if umask -S works.
-
-    if test -n "$dir_arg"; then
-      mkdir_mode=$mode