[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-90-g
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-90-gb3f8778 |
|
Date: |
Sat, 05 Dec 2009 14:13:39 +0000 |
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=b3f8778bd870913efbf5799cb9a10285a9476b7f
The branch, master has been updated
via b3f8778bd870913efbf5799cb9a10285a9476b7f (commit)
via 98ef3cfc3352d693b8c38cbea9489799fb68470b (commit)
via 8fa396f2a7713e75eee69951dfdeaf70e42fe3dd (commit)
via bf1ca571c83e5bfd37cefb8baee80adaf73a9c70 (commit)
via a943eec8cf4d4e6d5b9141cc06a3a7c4943128ab (commit)
via e3ce5eecd485e2428bab8a0c945c420ee555ef04 (commit)
via 2bee52debc0e96d7c09a429fc3c888bfaa32673a (commit)
via cce60a543d55a27b4a0424c580b58a4fd53ec1be (commit)
via 38064da41620ee89312d0bcff1aa5bc26c67cf84 (commit)
via c60c117a7868883baae56aa74022eebc3bfa00bf (commit)
from 5480d706b7a28c1ca585331bea20a05235613ecc (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 b3f8778bd870913efbf5799cb9a10285a9476b7f
Merge: a943eec8cf4d4e6d5b9141cc06a3a7c4943128ab
98ef3cfc3352d693b8c38cbea9489799fb68470b
Author: Ralf Wildenhues <address@hidden>
Date: Sat Dec 5 15:11:07 2009 +0100
Merge branch 'maint'
commit a943eec8cf4d4e6d5b9141cc06a3a7c4943128ab
Merge: 38064da41620ee89312d0bcff1aa5bc26c67cf84
e3ce5eecd485e2428bab8a0c945c420ee555ef04
Author: Ralf Wildenhues <address@hidden>
Date: Sat Dec 5 14:28:58 2009 +0100
Merge branch 'jk-silent'
* jk-silent:
Fix requirements of silent8.test.
commit e3ce5eecd485e2428bab8a0c945c420ee555ef04
Author: Ralf Wildenhues <address@hidden>
Date: Sat Dec 5 14:28:20 2009 +0100
Fix requirements of silent8.test.
* tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
dvips.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 38064da41620ee89312d0bcff1aa5bc26c67cf84
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 4 18:15:57 2009 +0100
Remove executable bit from automake.in
File `automake.in' is not meant to be executed (only to be
preprocessed into `automake'), so don't leave it executable.
* automake.in: Remove executable bit.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit c60c117a7868883baae56aa74022eebc3bfa00bf
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 4 18:40:50 2009 +0100
Don't make the generated Automake's Config.pm executable.
* lib/Automake/Makefile.am (Config.pm): Don't make the generated
`Config.pm' file executable.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++++
Makefile.in | 8 +++---
THANKS | 1 +
aclocal.m4 | 4 +-
automake.in | 5 ++-
bootstrap | 2 +-
configure | 39 ++++++++++++++++++++++---------------
lib/Automake/Makefile.am | 1 -
lib/Automake/Makefile.in | 1 -
lib/am/distdir.am | 8 +++---
tests/silent8.test | 1 +
tests/vala4.test | 11 +++++++--
12 files changed, 95 insertions(+), 34 deletions(-)
mode change 100755 => 100644 automake.in
diff --git a/ChangeLog b/ChangeLog
index a5c98fe..3e0f5b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2009-12-05 Antonio Diaz Diaz <address@hidden>
+
+ Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
+ * lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
+ instead of the respective un$tool invocation, to avoid depending
+ on another tool.
+ * THANKS: Update.
+
+2009-12-05 Ralf Wildenhues <address@hidden>
+
+ Use $DJDIR rather than $DJGPP to detect running on DJGPP.
+ * automake.in (Language): Use $ENV{'DJDIR'} for the
+ $ENV{'SHELL'} override.
+ * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
+ bootstrapping under MinGW when $DJGPP has been set.
+
+ Do not rely on Perl symlink status, for MSYS perl.
+ * automake.in (require_file_internal): Ensure presence of
+ symlink target file; MSYS perl symlink doesn't return an error
+ status when the file could not be created (copied, on this
+ system). Fixes symlink.test failure.
+
+2009-12-04 Stefano Lattarini <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ Avoid Solaris sh `set -e' bug in vala4.test.
+ * tests/vala4.test: New variable $cwd, holding the full path of the
+ current directory. Use it instead of `pwd` command substitution,
+ to avoid Heirloom/Solaris Sh bug with `set -e'.
+
+2009-12-05 Ralf Wildenhues <address@hidden>
+
+ Fix requirements of silent8.test.
+ * tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
+ dvips.
+
+2009-12-04 Stefano Lattarini <address@hidden>
+
+ File `automake.in' is not meant to be executed (only to be
+ preprocessed into `automake'), so don't leave it executable.
+ * automake.in: Remove executable bit.
+
+2009-12-04 Stefano Lattarini <address@hidden>
+
+ Don't make the generated Automake's Config.pm executable.
+ * lib/Automake/Makefile.am (Config.pm): Don't make the generated
+ `Config.pm' file executable.
+
2009-11-28 Jim Meyering <address@hidden>
do not put world-writable directories in distribution tarballs
diff --git a/Makefile.in b/Makefile.in
index d920566..d038a5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -663,17 +663,17 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/THANKS b/THANKS
index 71f3fae..8b3f14d 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ Andrew Suffield address@hidden
Andris Pavenis address@hidden
Angus Leeming address@hidden
Anthony Green address@hidden
+Antonio Diaz Diaz address@hidden
Arkadiusz Miskiewicz address@hidden
Art Haas address@hidden
Arto C. Nirkko address@hidden
diff --git a/aclocal.m4 b/aclocal.m4
index db90370..01c6b13 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
diff --git a/automake.in b/automake.in
old mode 100755
new mode 100644
index 2af2897..1d1f40c
--- a/automake.in
+++ b/automake.in
@@ -41,7 +41,7 @@ BEGIN
# it turns up other systems need the same thing. After all,
# if SHELL is used, ./configure's SHELL is always better than
# the user's SHELL (which may be something like tcsh).
- $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJGPP'};
+ $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
}
use Automake::Struct;
@@ -7875,7 +7875,8 @@ sub require_file_internal ($$$@)
unlink ($fullfile) if -f $fullfile;
if ($symlink_exists && ! $copy_missing)
{
- if (! symlink ("$libdir/$file", $fullfile))
+ if (! symlink ("$libdir/$file", $fullfile)
+ || ! -e $fullfile)
{
$suppress = 0;
$trailer = "; error while making link: $!";
diff --git a/bootstrap b/bootstrap
index fff40d5..2a86345 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,7 +61,7 @@ PERL_THREADS=0
# Override SHELL. This is required on DJGPP so that Perl's system()
# uses bash, not COMMAND.COM which doesn't quote arguments properly.
# It's not used otherwise.
-if test -n "$DJGPP"; then
+if test -n "$DJDIR"; then
BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
else
BOOTSTRAP_SHELL=/bin/sh
diff --git a/configure b/configure
index 6c63ac6..6bb1f12 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,14 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for GNU Automake 1.11a.
+# Generated by GNU Autoconf 2.65 for GNU Automake 1.11a.
#
# Report bugs to <address@hidden>.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -527,7 +529,8 @@ as_tr_cpp="eval sed
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -1333,7 +1336,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GNU Automake configure 1.11a
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1350,7 +1353,7 @@ This file contains any messages produced by compilers
while
running configure, to aid debugging if configure makes a mistake.
It was created by GNU Automake $as_me 1.11a, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1603,7 +1606,7 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script
$ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -1612,9 +1615,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -2087,6 +2090,7 @@ IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2094,7 +2098,6 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -3300,7 +3303,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by GNU Automake $as_me 1.11a, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3335,6 +3338,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -3351,10 +3355,11 @@ General help using GNU software:
<http://www.gnu.org/gethelp/>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
GNU Automake config.status 1.11a
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -3392,6 +3397,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -3574,7 +3581,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -3588,7 +3595,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index b4f5fbd..ff5b950 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -64,7 +64,6 @@ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
Config.pm: Config.in Makefile
$(AM_V_GEN)rm -f Config.tmp Config.pm
$(AM_V_at)$(do_subst) $(srcdir)/Config.in >Config.tmp
- $(AM_V_at)chmod +x Config.tmp
$(AM_V_at)chmod a-w Config.tmp
$(AM_V_at)mv -f Config.tmp Config.pm
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 225680d..05683c8 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -661,7 +661,6 @@ uninstall-am: uninstall-dist_perllibDATA
uninstall-nodist_perllibDATA
Config.pm: Config.in Makefile
$(AM_V_GEN)rm -f Config.tmp Config.pm
$(AM_V_at)$(do_subst) $(srcdir)/Config.in >Config.tmp
- $(AM_V_at)chmod +x Config.tmp
$(AM_V_at)chmod a-w Config.tmp
$(AM_V_at)mv -f Config.tmp Config.pm
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 9ec5b57..4e356b9 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -429,17 +429,17 @@ endif %?SUBDIRS%
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/tests/silent8.test b/tests/silent8.test
index 88f0821..2546775 100755
--- a/tests/silent8.test
+++ b/tests/silent8.test
@@ -16,6 +16,7 @@
# Check texinfo rules in silent-rules mode.
+required='makeinfo-html tex texi2dvi-o dvips'
. ./defs
set -e
diff --git a/tests/vala4.test b/tests/vala4.test
index 4301d45..7a15ebe 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -43,19 +43,24 @@ exit 0
END
chmod +x valac
+cwd=`pwd`
+
+# Use $cwd instead of `pwd` in the && list below to avoid a bug in
+# the way Solaris/Heirloom Sh handles `set -e'.
+
libtoolize
$ACLOCAL
$AUTOMAKE -a
$AUTOCONF
-./configure "VALAC=`pwd`/valac"
+./configure "VALAC=$cwd/valac"
sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.in >t
mv -f t configure.in
$AUTOCONF --force
-./configure "VALAC=`pwd`/valac" && Exit 1
+./configure "VALAC=$cwd/valac" && Exit 1
sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.in >t
mv -f t configure.in
$AUTOCONF --force
-./configure "VALAC=`pwd`/valac"
+./configure "VALAC=$cwd/valac"
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-90-gb3f8778,
Ralf Wildenhues <=