[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-578-g9999ab7

[Stefano Lattarini]

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=9999ab731445b4eddbd917e65007731a7e3c4a95

The branch, maint has been updated
       via  9999ab731445b4eddbd917e65007731a7e3c4a95 (commit)
       via  0ca3983bfa4c0c1f7e6658a5b7a83ed3d010eb26 (commit)
       via  e73061d354f6b82895ce9d439e8838a1f2da5d40 (commit)
      from  5431402f057db86fa7350c3c09d6078c12c0447c (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 9999ab731445b4eddbd917e65007731a7e3c4a95
Author: Reuben Thomas <address@hidden>
Date:   Mon Dec 5 23:40:48 2011 +0100

    python: remove relics for Python 1.5 support
    
    * m4/python.m4: The comments in here claim to support only
    Python >= 2.0, yet this file still has specific support for
    Python 1.5.  Just remove it, python 1.5 is 12 years old now,
    and practically defunct.
    * NEWS: Update.
    
    See also commit `Release-1-10-205-gd5bec12', "Support for
    Python 3.0, drop support for pre-2.0."

commit 0ca3983bfa4c0c1f7e6658a5b7a83ed3d010eb26
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 21 19:58:15 2011 +0100

    configure: remove extraneous 'eval's from AM_RUN_LOG invocations
    
    * configure.ac: Remove extra 'eval's from AM_RUN_LOG invocations;
    for example, instead of "AM_RUN_LOG([eval $PERL --version])",
    simply use "AM_RUN_LOG([$PERL --version])"

commit e73061d354f6b82895ce9d439e8838a1f2da5d40
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 21 19:21:41 2011 +0100

    configure: report TeX version in config.log
    
    * configure.ac: If possible, report the version of the selected
    TeX program; this should render the logs more informative.

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

Summary of changes:
 ChangeLog    |   24 ++++++++++++++++++++++++
 NEWS         |    3 +++
 configure.ac |   12 ++++++++----
 m4/python.m4 |   16 +++++-----------
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8c7b66..a8f1816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2011-12-07  Reuben Thomas  <address@hidden>  (tiny change)
+
+       python: remove relics for Python 1.5 support
+       * m4/python.m4: The comments in here claim to support only
+       Python >= 2.0, yet this file still has specific support for
+       Python 1.5.  Just remove it, python 1.5 is 12 years old now,
+       and practically defunct.
+       * NEWS: Update.
+       See also commit `Release-1-10-205-gd5bec12', "Support for
+       Python 3.0, drop support for pre-2.0."
+
+2011-12-21  Stefano Lattarini  <address@hidden>
+
+       configure: remove extraneous 'eval's from AM_RUN_LOG invocations
+       * configure.ac: Remove extra 'eval's from AM_RUN_LOG invocations;
+       for example, instead of "AM_RUN_LOG([eval $PERL --version])",
+       simply use "AM_RUN_LOG([$PERL --version])"
+
+2011-12-21  Stefano Lattarini  <address@hidden>
+
+       configure: report TeX version in config.log
+       * configure.ac: If possible, report the version of the selected
+       TeX program; this should render the logs more informative.
+
 2011-12-22  Stefano Lattarini  <address@hidden>
 
        maint: snapshots from `maint' are still development snapshots
diff --git a/NEWS b/NEWS
index 46803a7..785d6b0 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ New in 1.11.0a:
 
 * Miscellaneous changes:
 
+  - The last relics of Python 1.5 support have been removed from the
+    AM_PATH_PYTHON macro.
+
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
 
diff --git a/configure.ac b/configure.ac
index 8b1d685..334fc4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ if test -z "$PERL"; then
    AC_MSG_ERROR([perl not found])
 fi
 # Save details about the selected perl interpreter in config.log.
-AM_RUN_LOG([eval $PERL --version])
+AM_RUN_LOG([$PERL --version])
 $PERL -e 'require 5.006;' || {
    AC_MSG_ERROR(
 [perl 5.6 or better is required; perl 5.8.2 or better
@@ -100,6 +100,10 @@ AC_SUBST([PERL_THREADS])
 
 # The test suite will skip some tests if tex is absent.
 AC_CHECK_PROG([TEX], [tex], [tex])
+# Save details about the selected TeX program in config.log.
+# Redirect input from /dev/null, as TeX might otherwise hang waiting
+# for input from the terminal.
+AM_RUN_LOG([$TEX --version </dev/null])
 
 # Generate man pages.
 AM_MISSING_PROG([HELP2MAN], [help2man])
@@ -112,7 +116,7 @@ AM_MISSING_PROG([HELP2MAN], [help2man])
 
 required_autoconf_version=2.62
 AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed],
-[if AM_RUN_LOG([eval $am_AUTOCONF --version]);
+[if AM_RUN_LOG([$am_AUTOCONF --version]);
 then
   am_cv_autoconf_installed=yes
 else
@@ -126,7 +130,7 @@ fi
 AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
 [mkdir conftest
 echo 'AC''_INIT' > conftest/conftest.ac
-if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
+if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
 then
   am_cv_autoconf_works=yes
 else
@@ -142,7 +146,7 @@ AC_CACHE_CHECK([whether autoconf is recent enough], 
[am_cv_autoconf_version],
 [mkdir conftest
 dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
 echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
-if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
+if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
 then
   am_cv_autoconf_version=yes
 else
diff --git a/m4/python.m4 b/m4/python.m4
index 89f2dfb..ee3eb95 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -10,7 +10,7 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # ---------------------------------------------------------------------------
@@ -114,9 +114,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl   site-packages directory, not the python standard library
   dnl   directory like in previous automake betas.  This behavior
   dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
+  dnl Query distutils for this directory.
   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
     [am_cv_python_pythondir],
     [if test "x$prefix" = xNONE
@@ -125,8 +123,7 @@ AC_DEFUN([AM_PATH_PYTHON],
      else
        am_py_prefix=$prefix
      fi
-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import 
sysconfig; 
sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 
2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import 
sysconfig; 
sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 
2>/dev/null`
      case $am_cv_python_pythondir in
      $am_py_prefix*)
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -152,9 +149,7 @@ AC_DEFUN([AM_PATH_PYTHON],
 
   dnl pyexecdir -- directory for installing python extension modules
   dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
+  dnl Query distutils for this directory.
   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
     [am_cv_python_pyexecdir],
     [if test "x$exec_prefix" = xNONE
@@ -163,8 +158,7 @@ AC_DEFUN([AM_PATH_PYTHON],
      else
        am_py_exec_prefix=$exec_prefix
      fi
-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import 
sysconfig; 
sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 
2>/dev/null ||
-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import 
sysconfig; 
sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 
2>/dev/null`
      case $am_cv_python_pyexecdir in
      $am_py_exec_prefix*)
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`


hooks/post-receive
-- 
GNU Automake