Sync with Automake 1.6.3.

diff --git a/config/depcomp b/config/depcomp
index 65899658ee7fe8de71d8f8fbcd869440f173ed5d..807b991f4a895431dfc232112e77b0ae7e3d5017 100755 (executable)
--- a/config/depcomp
+++ b/config/depcomp
@@ -31,7 +31,16 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
 fi
 # `libtool' can also be set to `yes' or `no'.
 
 fi
 # `libtool' can also be set to `yes' or `no'.
 

-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+if test -z "$depfile"; then
+   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+   dir=`echo "$object" | sed 's,/.*$,/,'`
+   if test "$dir" = "$object"; then
+      dir=
+   fi
+   # FIXME: should be _deps on DOS.
+   depfile="$dir.deps/$base"
+fi
+

 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"


@@ -198,17 +207,22 @@ aix)
   ;;
 
 tru64)
   ;;
 
 tru64)

-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # The Tru64 compiler uses -MD to generate dependencies as a side

    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.

-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put

    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.

+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`

 
 

-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 

    if test "$libtool" = yes; then
    if test "$libtool" = yes; then

+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"

       "$@" -Wc,-MD
    else
       "$@" -Wc,-MD
    else

+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"

       "$@" -MD
    fi
 
       "$@" -MD
    fi
 


@@ -240,34 +254,40 @@ tru64)
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*

-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-       "--mode=compile")
-         # insert --quiet before "--mode=compile"
-         set fnord "$@" --quiet
-         shift # fnord
-         ;;
-       esac
-       set fnord "$@" "$arg"
-       shift # fnord
-       shift # "$arg"
-      done
+  # always write the proprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.  We will use -o /dev/null later,
+  # however we can't do the remplacement now because
+  # `-o $object' might simply not be used
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg

       ;;
     esac
       ;;
     esac

-    "$@" $dashmflag | sed 's:^[^:]*\:[         ]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[      ]*:'"$object"'\: :' > "$tmpdepfile"

   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '


@@ -285,36 +305,31 @@ dashXmstdout)
   ;;
 
 makedepend)
   ;;
 
 makedepend)

+  "$@" || exit $?

   # X makedepend
   # X makedepend

-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-       cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-         set fnord "$@" "$arg"; shift;;
-       -*)
-         ;;
-       *)
-         set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    -*)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"

   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"

-  tail +3 "$tmpdepfile" | tr ' ' '
+  sed '1,2d' "$tmpdepfile" | tr ' ' '

 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.


@@ -324,35 +339,39 @@ makedepend)
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*

-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-       "--mode=compile")
-         # insert --quiet before "--mode=compile"
-         set fnord "$@" --quiet
-         shift # fnord
-         ;;
-       esac
-       set fnord "$@" "$arg"
-       shift # fnord
-       shift # "$arg"
-      done
+  # always write the proprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg

       ;;
     esac
       ;;
     esac

-    "$@" -E |
+  done
+
+  "$@" -E |

     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"

-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi

   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"


@@ -364,32 +383,25 @@ msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
   # always write the proprocessed file to stdout, regardless of -o,
   # because we must use -o when running libtool.
   # Important note: in order to support this mode, a compiler *must*
   # always write the proprocessed file to stdout, regardless of -o,
   # because we must use -o when running libtool.

-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-       "--mode=compile")
-         # insert --quiet before "--mode=compile"
-         set fnord "$@" --quiet
-         shift # fnord
-         ;;
-       esac
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+       set fnord "$@"
+       shift
+       shift
+       ;;
+    *)

        set fnord "$@" "$arg"
        set fnord "$@" "$arg"

-       shift # fnord
-       shift # "$arg"
-      done
-      ;;
+       shift
+       shift
+       ;;

     esac
     esac

-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"

   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::   \1 \\:p' >> "$depfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::   \1 \\:p' >> "$depfile"

diff --git a/config/install-sh b/config/install-sh
index e9de23842dcd44d2953129c866b1ad25f7e1f1d9..11870f1b0192aa3f321bc3a82552d27f0aa2352d 100755 (executable)
--- a/config/install-sh
+++ b/config/install-sh
@@ -109,7 +109,7 @@ then
        echo "install:  no input file specified"
        exit 1
 else
        echo "install:  no input file specified"
        exit 1
 else

-       true
+       :

 fi
 
 if [ x"$dir_arg" != x ]; then
 fi
 
 if [ x"$dir_arg" != x ]; then


@@ -120,7 +120,7 @@ if [ x"$dir_arg" != x ]; then
                instcmd=:
                chmodcmd=""
        else
                instcmd=:
                chmodcmd=""
        else

-               instcmd=mkdir
+               instcmd=$mkdirprog

        fi
 else
 
        fi
 else
 


@@ -128,9 +128,9 @@ else
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 

-       if [ -f $src -o -d $src ]
+       if [ -f "$src" ] || [ -d "$src" ]

        then
        then

-               true
+               :

        else
                echo "install:  $src does not exist"
                exit 1
        else
                echo "install:  $src does not exist"
                exit 1


@@ -141,7 +141,7 @@ else
                echo "install:  no destination specified"
                exit 1
        else
                echo "install:  no destination specified"
                exit 1
        else

-               true
+               :

        fi
 
 # If destination is a directory, append the input filename; if your system
        fi
 
 # If destination is a directory, append the input filename; if your system


@@ -151,7 +151,7 @@ else
        then
                dst="$dst"/`basename $src`
        else
        then
                dst="$dst"/`basename $src`
        else

-               true
+               :

        fi
 fi
 
        fi
 fi
 


@@ -163,8 +163,8 @@ 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}}"
 
 oIFS="${IFS}"
 IFS="${IFS-${defaultIFS}}"
 
 oIFS="${IFS}"


@@ -183,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
                $mkdirprog "${pathcomp}"
        else
         then
                $mkdirprog "${pathcomp}"
        else

-               true
+               :

        fi
 
        pathcomp="${pathcomp}/"
        fi
 
        pathcomp="${pathcomp}/"


@@ -194,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
        $doit $instcmd $dst &&
 
 then
        $doit $instcmd $dst &&
 

-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi

 else
 
 # If we're going to rename the final executable, determine the name now.
 else
 
 # If we're going to rename the final executable, determine the name now.


@@ -216,7 +216,7 @@ else
        then
                dstfile=`basename $dst`
        else
        then
                dstfile=`basename $dst`
        else

-               true
+               :

        fi
 
 # Make a temp file name in the proper directory.
        fi
 
 # Make a temp file name in the proper directory.


@@ -235,10 +235,10 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 

-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&

 
 # Now rename the file to the real destination.
 
 
 # Now rename the file to the real destination.