This is the mail archive of the cygwin mailing list for the Cygwin project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] cygport-0.2.7 autoconf-2.61/automake-1.10 support

Two minor changes missed in 0.2.7's ac2.61 support:

  (1) prefer --datarootdir for ac2.60 *and above*, not just ac2.60
  (2) automake-1.10's aclocal inserts more stringent error checking
      for autoconf version mismatch into aclocal.m4.  This error
      checking cause <current> autoreconf to complain if it is newer
      than the autoconf used originally. See aclocal snippet below:

From aclocal-1.10:
  if ($ac_version)
      # Do not use "$output_file" here for the same reason we do not
      # use it in the header below.  autom4te will output the name of
      # the file in the diagnostic anyway.
      $output = "m4_if(m4_PACKAGE_VERSION, [$ac_version],,
[m4_fatal([this file was generated for autoconf $ac_version.
You have another version of autoconf.  If you want to use that,
you should regenerate the build system entirely.], [63])])

I interpret "regenerate the build system entirely" to mean "remove all autotool generated files before running autoreconf".

2007-01-05 Charles Wilson <...>

	* bin/ use --datarootdir in preference
	to --datadir/--infodir/--mandir when using
	autoconf-2.60 and later.
	* Ensure that autoconf will not complain
	when it is newer than the one previously used (needed
	because automake-1.10's aclocal now inserts more stringent
	checking into aclocal.m4)


Index: bin/
RCS file: /cvsroot/cygwin-ports/cygport/bin/,v
retrieving revision 1.45
diff -u -r1.45
--- bin/	4 Jan 2007 02:35:26 -0000	1.45
+++ bin/	6 Jan 2007 01:01:22 -0000
@@ -796,7 +796,7 @@
 	case "x$(grep -m 1 'GNU Autoconf' ${confdir}/configure | cut -d ' ' -f 6)" in
-		x2.60)
+		x2.60|x2.61)
 			confargs+=" --datarootdir=/usr/share --docdir=/usr/share/doc/${P}"
RCS file: /cvsroot/cygwin-ports/cygport/,v
retrieving revision 1.4
diff -u -r1.4
---	22 Nov 2006 04:44:58 -0000	1.4
+++	6 Jan 2007 00:10:08 -0000
@@ -16,6 +16,12 @@
 cd ${S}
+verbose rm -rf autom4te.cache/
+verbose rm -f bin/  data/ 
+verbose rm -f doc/  lib/
+verbose rm -f      test/
+verbose rm -f aclocal.m4
 verbose aclocal --force
 verbose autoconf --force
 verbose automake --add-missing --copy --force-missing

Unsubscribe info:
Problem reports:

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]