[SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-80-g30dc771

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=30dc771d7bde0104962a5e591c4d1acb30e6d1bd

The branch, branch-1-10 has been updated
       via  30dc771d7bde0104962a5e591c4d1acb30e6d1bd (commit)
      from  100e395212e379e8f909427ce7eb751148c2d180 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 30dc771d7bde0104962a5e591c4d1acb30e6d1bd
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jan 21 23:04:29 2008 +0100

    * lib/config-ml.in: Sync from upstream.
    * tests/multlib.test: Add `pwd` to $PATH instead of absolute
    references to mycc.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    6 ++++
 lib/config-ml.in   |   78 ++++++++++++---------------------------------------
 tests/multlib.test |    7 ++--
 3 files changed, 29 insertions(+), 62 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9b97af..242824f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-21  Ralf Wildenhues  <address@hidden>
 
+       * lib/config-ml.in: Sync from upstream.
+       * tests/multlib.test: Add `pwd` to $PATH instead of absolute
+       references to mycc.
+
+2008-01-21  Ralf Wildenhues  <address@hidden>
+
        * tests/tar.test: Skip if no appropriate tar was found.
 
 2008-01-19  NightStrike  <address@hidden>
diff --git a/lib/config-ml.in b/lib/config-ml.in
index efec5a3..3ae1974 100644
--- a/lib/config-ml.in
+++ b/lib/config-ml.in
@@ -1,8 +1,8 @@
 # Configure fragment invoked in the post-target section for subdirs
 # wanting multilib support.
 #
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # 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
@@ -382,28 +382,6 @@ mips*-*-*)
            esac
          done
        fi
-       case " $multidirs " in
-       *" mabi=64 "*)
-         # We will not be able to create libraries with -mabi=64 if
-         # we cannot even link a trivial program.  It usually
-         # indicates the 64bit libraries are missing.
-         if echo 'main() {}' > conftest.c &&
-            ${CC-gcc} -mabi=64 conftest.c -o conftest; then
-           :
-         else
-           echo Could not link program with -mabi=64, disabling it.
-           old_multidirs="${multidirs}"
-           multidirs=""
-           for x in ${old_multidirs}; do
-             case "$x" in
-             *mabi=64* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-             esac
-           done
-         fi
-         rm -f conftest.c conftest
-         ;;
-       esac
        ;;
 powerpc*-*-* | rs6000*-*-*)
        if [ x$enable_aix64 = xno ]
@@ -495,30 +473,6 @@ powerpc*-*-* | rs6000*-*-*)
          done
        fi
        ;;
-sparc*-*-*)
-       case " $multidirs " in
-       *" m64 "*)
-         # We will not be able to create libraries with -m64 if
-         # we cannot even link a trivial program.  It usually
-         # indicates the 64bit libraries are missing.
-         if echo 'main() {}' > conftest.c &&
-            ${CC-gcc} -m64 conftest.c -o conftest; then
-           :
-         else
-           echo Could not link program with -m64, disabling it.
-           old_multidirs="${multidirs}"
-           multidirs=""
-           for x in ${old_multidirs}; do
-             case "$x" in
-             *m64* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-             esac
-           done
-         fi
-         rm -f conftest.c conftest
-         ;;
-       esac
-       ;;
 esac
 
 # Remove extraneous blanks from multidirs.
@@ -540,7 +494,7 @@ multi-do:
        else \
          rootpre=`${PWD_COMMAND}`/; export rootpre; \
          srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
-         lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+         lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
          compiler="$(CC)"; \
          for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
            dir=`echo $$i | sed -e 's/;.*$$//'`; \
@@ -551,6 +505,7 @@ multi-do:
                flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
                if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
                                CFLAGS="$(CFLAGS) $${flags}" \
+                               CCASFLAGS="$(CCASFLAGS) $${flags}" \
                                FCFLAGS="$(FCFLAGS) $${flags}" \
                                FFLAGS="$(FFLAGS) $${flags}" \
                                ADAFLAGS="$(ADAFLAGS) $${flags}" \
@@ -585,8 +540,13 @@ multi-clean:
          true; \
        else \
          lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
-         for dir in Makefile $(MULTIDIRS); do \
-           if [ -f ../$${dir}/$${lib}/Makefile ]; then \
+         for dir in : $(MULTIDIRS); do \
+           test $$dir != : || continue; \
+EOF
+cat >>Multi.tem <<EOF
+           if [ -f ../\$\${dir}/\$\${lib}/${Makefile} ]; then \\
+EOF
+cat >>Multi.tem <<\EOF
              if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
              then true; \
              else exit 1; \
@@ -604,7 +564,7 @@ mv Makefile.tem ${Makefile}
 fi # ${ml_toplevel_p} = yes
 
 if [ "${ml_verbose}" = --verbose ]; then
-  echo "Adding multilib support to Makefile in ${ml_realsrcdir}"
+  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
   if [ "${ml_toplevel_p}" = yes ]; then
     echo "multidirs=${multidirs}"
   fi
@@ -695,7 +655,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
   fi
 
   ml_origdir=`${PWDCMD-pwd}`
-  ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
+  ml_libdir=`echo "$ml_origdir" | sed -e 's,^.*/,,'`
   # cd to top-level-build-dir/${with_target_subdir}
   cd ..
 
@@ -731,7 +691,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     case ${srcdir} in
     ".")
-      echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
+      echo "Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}"
       if [ "${with_target_subdir}" != "." ]; then
        ml_unsubdir="../"
       else
@@ -739,7 +699,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       fi
       (cd ${ml_dir}/${ml_libdir};
        ../${dotdot}${ml_unsubdir}symlink-tree 
../${dotdot}${ml_unsubdir}${ml_libdir} "")
-      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
        if [ x"${MAKE}" = x ]; then
          (cd ${ml_dir}/${ml_libdir}; make distclean)
        else
@@ -796,7 +756,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     else
        # Create a regular expression that matches any string as long
        # as ML_POPDIR.
-       popdir_rx=`echo ${ML_POPDIR} | sed 's,.,.,g'`
+       popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'`
        CC_=
        for arg in ${CC}; do
          case $arg in
@@ -894,17 +854,17 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; 
then
 
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
        --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
-       ${ac_configure_args} ${ml_srcdiroption} ; then
+       ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
       true
     else
       exit 1
     fi
 
-    cd ${ML_POPDIR}
+    cd "${ML_POPDIR}"
 
   done
 
-  cd ${ml_origdir}
+  cd "${ml_origdir}"
 fi
 
 fi # ${ml_toplevel_p} = yes
diff --git a/tests/multlib.test b/tests/multlib.test
index 8f846ee..8295120 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -49,6 +49,7 @@ gcc ${1+"$@"}
 END
 
 chmod +x mycc
+PATH=`pwd`:$PATH
 
 cat >Makefile.am <<'EOF'
 SUBDIRS = @subdirs@
@@ -130,7 +131,7 @@ cd ..
 # Check VPATH builds
 mkdir build
 cd build
-../configure --enable-multilib CC=`pwd`/../mycc
+../configure --enable-multilib CC=mycc
 $MAKE
 $MAKE install
 $MAKE distcleancheck
@@ -138,5 +139,5 @@ $MAKE distcleancheck
 # Check standard builds.
 cd ..
 # Why to I have to specify --with-target-subdir?
-./configure --enable-multilib --with-target-subdir=. CC=`pwd`/mycc
+./configure --enable-multilib --with-target-subdir=. CC=mycc
 $MAKE


hooks/post-receive
--
GNU Automake