Hello Karl,
* Karl Berry wrote on Mon, Aug 21, 2006 at 02:21:26AM CEST:
>
> I have not followed recent Automake/Autoconf developments in detail,
> so the configure.ac and Makefile.am's would be especially good for
> others to take a look at.
Please remove the file m4/strerror_r.m4 from hello; it's not part of
gnulib any more, and it was outdated wrt. Autoconf-2.60, in that it
requires an exit declaration; regenerating configure after the removal
reveals this:
| @@ -6282,7 +6286,7 @@
| {
| char buf[100];
| char x = *strerror_r (0, buf, sizeof buf);
| - exit (!isalpha (x));
| + return ! isalpha (x);
| ;
| return 0;
| }
Second, please apply the first patch below. The backslashes may have
been necessary at some distant point in the past, but they are certainly
not today (though they don't do harm, either).
Then, I'd apply the second patch below to not depend on `echo'
supporting `-e', while also not introducing a dependence on the
non-portable newline-passing of make (required by Posix but fixed in GNU
make only recently). But since you require GNU diffutils diff in the
make rule anyway, I guess this is more of a taste issue.
Cheers,
Ralf
2006-08-21 Ralf Wildenhues <[EMAIL PROTECTED]> (tiny change)
* configure.ac (AC_CONFIG_FILES): Drop backslashes.
* Makefile.am (diff): Do not use `echo -e'.
--- hello-2.1.91/configure.ac 2006-08-21 01:43:42.000000000 +0200
+++ hello-2.1.91/configure.ac 2006-08-21 07:40:03.000000000 +0200
@@ -39,12 +39,12 @@
AM_GNU_GETTEXT_VERSION([0.15])
AM_GNU_GETTEXT([external])
-AC_CONFIG_FILES([Makefile \
- contrib/Makefile \
- doc/Makefile \
- gnulib/lib/Makefile \
- man/Makefile \
- po/Makefile.in \
- src/Makefile \
+AC_CONFIG_FILES([Makefile
+ contrib/Makefile
+ doc/Makefile
+ gnulib/lib/Makefile
+ man/Makefile
+ po/Makefile.in
+ src/Makefile
tests/Makefile])
AC_OUTPUT
--- hello-2.1.91/Makefile.in 2006-08-21 01:45:31.000000000 +0200
+++ hello-2.1.91/Makefile.in 2006-08-21 07:46:28.000000000 +0200
@@ -672,10 +671,9 @@
#
diff: diffcheck
- echo -e "\
-To apply these patches, cd to the main directory of the package\n\
-and then use \`patch -p1 < hello-XXX.diff'.\n\
-Before building the program, run \`autogen.sh'.\n" > \
+ @(echo "To apply these patches, cd to the main directory of the
package"; \
+ echo "and then use \`patch -p1 < hello-XXX.diff'."; \
+ echo "Before building the program, run \`autogen.sh'."; ) > \
$(PACKAGE)-$(hello_pre)-$(VERSION).diff
-diff -rc2P --exclude=configure --exclude=config.h.in --exclude=*.info \
--exclude=*.gmo --exclude=aclocal.m4 \
