[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-14-ge62f05a

[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=e62f05ae7df883045e94d4fe090cc14204605667

The branch, branch-1.11 has been updated
       via  e62f05ae7df883045e94d4fe090cc14204605667 (commit)
       via  77c93b3e7b7cf3182857fc43e0588ce42fa574e5 (commit)
       via  d9bd0090cf471a088bc0119cd989c06a63d2408e (commit)
       via  edf543567edfbd3e4d658180fdb2cb2b26eb9783 (commit)
       via  6d44a667bd1307162187efe7514e6d4abd122dd6 (commit)
       via  32e88686a445c06126ef473460d9762d19d5ae8d (commit)
      from  f7742385880302d1022bc053a5b9cfddf8629549 (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 e62f05ae7df883045e94d4fe090cc14204605667
Merge: f7742385880302d1022bc053a5b9cfddf8629549 
77c93b3e7b7cf3182857fc43e0588ce42fa574e5
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 24 14:45:19 2009 +0200

    Merge branch 'maint' into branch-1.11

commit 77c93b3e7b7cf3182857fc43e0588ce42fa574e5
Author: Ralf Wildenhues <address@hidden>
Date:   Sat May 23 23:08:31 2009 +0200

    testsuite: unset installation directory variables.
    
    * tests/defs.in: Before test execution, be sure to unset all
    installation directory variables, so they cannot have an effect
    on a `make -e install' command within a test.
    Report by Dagobert Michelsen.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit d9bd0090cf471a088bc0119cd989c06a63d2408e
Author: Ralf Wildenhues <address@hidden>
Date:   Sat May 23 23:05:17 2009 +0200

    testsuite: do not change the mode of installed Libtool files.
    
    * tests/defs.in: Do not use `chmod -R' on the test directory, as
    that may change or try to change the mode of installed files:
    the test directory may contain symlinks to ltmain.sh files from
    a Libtool installation, and Solaris `chmod -R' touches symlink
    targets.  Instead, use the cleanup strategy used in distdir.am.
    * NEWS: Update.
    Report by Dagobert Michelsen.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit edf543567edfbd3e4d658180fdb2cb2b26eb9783
Author: Ralf Wildenhues <address@hidden>
Date:   Sat May 23 22:54:15 2009 +0200

    testsuite: do not fail in cleanup code.
    
    * tests/defs.in: Turn off errexit in the cleanup trap, to avoid
    a test failure due to a nonzero command.
    * THANKS: Update.
    Report by Dagobert Michelsen.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 6d44a667bd1307162187efe7514e6d4abd122dd6
Author: Peter O'Gorman <address@hidden>
Date:   Sat May 23 22:13:14 2009 +0200

    python: do not install in system directories on Darwin 9.
    
    On Darwin 9, get_python_lib returns a path below `/Library/Python'
    regardless of the `prefix' argument it was passed, causing `make
    install' to target the system directories regardless of `--prefix'
    argument used.  Work around this Darwin bug by ignoring the result
    of get_python_lib if it points outside of the passed prefix, and
    the prefix was not a system directory.
    
    * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
    initial portion of the pythondir returned by get_python_lib, then
    ignore it unless the configured prefix is `/usr' or starts with
    `/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 32e88686a445c06126ef473460d9762d19d5ae8d
Author: Ralf Wildenhues <address@hidden>
Date:   Sat May 23 22:06:07 2009 +0200

    Clarify how to enable `silent-rules' and other global options.
    
    * doc/automake.texi (Options): When introducing options, be more
    careful to note that not all of them can be specified in
    AUTOMAKE_OPTIONS statements, and that some do not make sense in
    subdirectories.  Note more prominently that `silent-rules' can
    only be specified in configure.ac.
    * lib/Automake/Options.pm (_process_option_list): Improve error
    message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
    options specified in Makefile.am files.
    Report by Bruno Haible.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog               |   51 +++++++++++++++++++++++++++++++++++++++++++++++
 NEWS                    |   11 ++++++++++
 THANKS                  |    1 +
 doc/automake.texi       |   22 +++++++++++++------
 lib/Automake/Options.pm |    6 +++-
 m4/python.m4            |   16 ++++++++++++++
 tests/defs.in           |   19 ++++++++++++----
 7 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6bc1d2..61e2917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2009-05-23  Ralf Wildenhues  <address@hidden>
+
+       testsuite: unset installation directory variables.
+       * tests/defs.in: Before test execution, be sure to unset all
+       installation directory variables, so they cannot have an effect
+       on a `make -e install' command within a test.
+       Report by Dagobert Michelsen.
+
+       testsuite: do not change the mode of installed Libtool files.
+       * tests/defs.in: Do not use `chmod -R' on the test directory, as
+       that may change or try to change the mode of installed files:
+       the test directory may contain symlinks to ltmain.sh files from
+       a Libtool installation, and Solaris `chmod -R' touches symlink
+       targets.  Instead, use the cleanup strategy used in distdir.am.
+       * NEWS: Update.
+       Report by Dagobert Michelsen.
+
+       testsuite: do not fail in cleanup code.
+       * tests/defs.in: Turn off errexit in the cleanup trap, to avoid
+       a test failure due to a nonzero command.
+       * THANKS: Update.
+       Report by Dagobert Michelsen.
+
+2009-05-23  Peter O'Gorman  <address@hidden>
+
+       python: do not install in system directories on Darwin 9.
+       On Darwin 9, get_python_lib returns a path below `/Library/Python'
+       regardless of the `prefix' argument it was passed, causing `make
+       install' to target the system directories regardless of `--prefix'
+       argument used.  Work around this Darwin bug by ignoring the result
+       of get_python_lib if it points outside of the passed prefix, and
+       the prefix was not a system directory.
+       * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
+       initial portion of the pythondir returned by get_python_lib, then
+       ignore it unless the configured prefix is `/usr' or starts with
+       `/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
+       * NEWS: Update.
+
+2009-05-23  Ralf Wildenhues  <address@hidden>
+
+       Clarify how to enable `silent-rules' and other global options.
+       * doc/automake.texi (Options): When introducing options, be more
+       careful to note that not all of them can be specified in
+       AUTOMAKE_OPTIONS statements, and that some do not make sense in
+       subdirectories.  Note more prominently that `silent-rules' can
+       only be specified in configure.ac.
+       * lib/Automake/Options.pm (_process_option_list): Improve error
+       message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax'
+       options specified in Makefile.am files.
+       Report by Bruno Haible.
+
 2009-05-21  Ralf Wildenhues  <address@hidden>
 
        Skip specflg10.test without a C++ compiler.
diff --git a/NEWS b/NEWS
index 8c5aee7..48873d0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,17 @@ New in 1.11.0a:
 
 Bugs fixed in 1.11.0a:
 
+* Long standing bugs:
+
+  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
+    even if the `--prefix' argument pointed outside of a system directory.
+    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
+    `get_python_lib' function if it points outside the configured prefix,
+    unless the `--prefix' argument was either `/usr' or below `/System'.
+
+  - The testsuite does not try to change the mode of `ltmain.sh' files from
+    a Libtool installation (symlinked to test directories) any more.
+
 
 New in 1.11:
 
diff --git a/THANKS b/THANKS
index 07b5872..6f6598e 100644
--- a/THANKS
+++ b/THANKS
@@ -58,6 +58,7 @@ Chris Provenzano      address@hidden
 Christian Cornelssen   address@hidden
 Claudio Fontana                address@hidden
 Clifford Wolf          address@hidden
+Dagobert Michelsen     address@hidden
 Dalibor Topic          address@hidden
 danbp                  address@hidden
 Daniel Jacobowitz      address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 1c93024..6c6765f 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8912,13 +8912,18 @@ will now be rerun each time the version number is 
bumped, when only
 @node Options
 @chapter Changing Automake's Behavior
 
-Various features of Automake can be controlled by options in the
address@hidden  Such options are applied on a address@hidden
-basis when listed in a special @file{Makefile} variable named
address@hidden  They are applied globally to all processed
address@hidden when listed in the first argument of
address@hidden in @file{configure.ac}.  Currently understood
-options are:
+Various features of Automake can be controlled by options.  Except where
+noted otherwise, options can be specified in one of several ways: Most
+options can be applied on a address@hidden basis when listed in a
+special @file{Makefile} variable named @code{AUTOMAKE_OPTIONS}.  Some
+of these options only make sense when specified in the toplevel
address@hidden file.  Options are applied globally to all processed
address@hidden files when listed in the first argument of
address@hidden in @file{configure.ac}, and some options which
+require changes to the @command{configure} script can only be specified
+there.  These are annotated below.
+
+Currently understood options are:
 @vindex AUTOMAKE_OPTIONS
 
 @table @asis
@@ -9121,6 +9126,9 @@ Call the @code{AM_SILENT_RULES} macro from within the 
@file{configure.ac}
 file.
 @end itemize
 
+It is not possible to instead specify @option{silent-rules} in a
address@hidden file.
+
 @cindex default verbosity for silent-rules
 If the developer has done either of the above, then the user of the
 package may influence the verbosity at @command{configure} run time as
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index d104414..cacc7d2 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -279,13 +279,15 @@ sub _process_option_list (\%$@)
       elsif ($_ eq  'silent-rules')
         {
          error ($where,
-                "option `$_' must be an argument of AM_INIT_AUTOMAKE")
+                "option `$_' can only be used as argument to 
AM_INIT_AUTOMAKE\n"
+                . "but not in AUTOMAKE_OPTIONS makefile statements")
            if $where->get !~ /^configure\./;
        }
       elsif ($_ eq 'tar-v7' || $_ eq 'tar-ustar' || $_ eq 'tar-pax')
        {
          error ($where,
-                "option `$_' must be an argument of AM_INIT_AUTOMAKE")
+                "option `$_' can only be used as argument to 
AM_INIT_AUTOMAKE\n"
+                . "but not in AUTOMAKE_OPTIONS makefile statements")
            if $where->get !~ /^configure\./;
          for my $opt ('tar-v7', 'tar-ustar', 'tar-pax')
            {
diff --git a/m4/python.m4 b/m4/python.m4
index 239285f..16de9c3 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -128,6 +128,14 @@ python2.1 python2.0])
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed 
"s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+         
am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+         ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pythondir], [$am_cv_python_pythondir])
@@ -158,6 +166,14 @@ python2.1 python2.0])
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed 
"s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+          
am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+          ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
diff --git a/tests/defs.in b/tests/defs.in
index 6e26202..d1366f1 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -247,18 +247,22 @@ Exit ()
 
 curdir=`pwd`
 testSubDir=$me.dir
-chmod -R u+rwx $testSubDir > /dev/null 2>&1
-rm -rf $testSubDir > /dev/null 2>&1
+test ! -d $testSubDir || {
+  find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+  rm -rf $testSubDir
+}
 mkdir $testSubDir
 
 address@hidden@
 if test "$sh_errexit_works" = yes; then
   trap 'exit_status=$?
+    set +e
     cd "$curdir"
     case $exit_status,$keep_testdirs in
     0,)
-      chmod -R a+rwx $testSubDir > /dev/null 2>&1
-      rm -rf "$testSubDir" ;;
+      find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+      rm -rf $testSubDir
+      ;;
     esac
     test "$signal" != 0 &&
       echo "$as_me: caught signal $signal"
@@ -296,9 +300,14 @@ END
 unset MFLAGS
 unset MAKEFLAGS
 unset MAKELEVEL
-unset DESTDIR
 # Unset verbosity flag.
 unset V
+# Also unset variables that will let `make -e install' divert
+# files into unwanted directories.
+unset DESTDIR
+unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
+unset htmldir includedir infodir libdir libexecdir localedir mandir
+unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
 # Also unset variables that control our test driver.  While not
 # conceptually independent, they cause some changed semantics we
 # need to control (and test for) in some of the tests to ensure


hooks/post-receive
-- 
GNU Automake