Message-ID: <459F0711.5080705@cwilson.fastmail.fm>
Date: Fri, 05 Jan 2007 21:18:57 -0500
From: Charles Wilson <cygwin AT cwilson DOT fastmail DOT fm>
User-Agent: Thunderbird 1.5.0.9 (Windows/20061207)
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: [patch] cygport-0.2.7 autoconf-2.61/automake-1.10 support
Content-Type: multipart/mixed;  boundary="------------060107040600020303070209"
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com

--------------060107040600020303070209
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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/cygport.in: use --datarootdir in preference
	to --datadir/--infodir/--mandir when using
	autoconf-2.60 and later.
	* autogen.sh: 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)

--
Chuck


--------------060107040600020303070209
Content-Type: text/plain;
 name="cygport-ac2.61.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cygport-ac2.61.patch"

Index: bin/cygport.in
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/bin/cygport.in,v
retrieving revision 1.45
diff -u -r1.45 cygport.in
--- bin/cygport.in	4 Jan 2007 02:35:26 -0000	1.45
+++ bin/cygport.in	6 Jan 2007 01:01:22 -0000
@@ -796,7 +796,7 @@
 	fi
 
 	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}"
 			;;
 		*)
Index: autogen.sh
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh	22 Nov 2006 04:44:58 -0000	1.4
+++ autogen.sh	6 Jan 2007 00:10:08 -0000
@@ -16,6 +16,12 @@
 }
 
 cd ${S}
+verbose rm -rf autom4te.cache/
+verbose rm -f bin/Makefile.in  data/Makefile.in 
+verbose rm -f doc/Makefile.in  lib/Makefile.in
+verbose rm -f Makefile.in      test/Makefile.in
+verbose rm -f aclocal.m4
+
 verbose aclocal --force
 verbose autoconf --force
 verbose automake --add-missing --copy --force-missing


--------------060107040600020303070209
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------060107040600020303070209--