ports/89248: autoheader run in wrong order in run-autotools rule

[Seán Farley]

>Number:         89248
>Category:       ports
>Synopsis:       autoheader run in wrong order in run-autotools rule
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 18 18:50:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Seán Farley
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 6.0-STABLE FreeBSD 6.0-STABLE #1: Thu Nov 17 14:07:35 CST 2005 root at thor.farley.org:/usr/obj/usr/src/sys/THOR i386

>Description:
Within the run-autotools rule in ports, autoheader is run after automake
and autoconf.  If a port needs to run all four auto* tools, then it will
(at least for me) fail.

>How-To-Repeat:
Run make configure on a port that only has a configure.ac and
Makefile.am.  The output I get:

configure.ac: installing `./install-sh'
configure.ac: installing `./missing'
common/b5c/Makefile.am: installing `./depcomp'
configure.ac:20: installing `./config.guess'
configure.ac:20: installing `./config.sub'
configure.ac:4: required file `config.h.in' not found

autoheader is the one creating the config.h.in.

>Fix:

Just place autoheader before automake in the run-autotools rule.

------------------------------------------
--- bsd.autotools.mk.orig	Fri Nov 18 12:36:20 2005
+++ bsd.autotools.mk	Fri Nov 18 12:36:20 2005
@@ -331,6 +331,10 @@
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
 		${ACLOCAL_ARGS})
 . endif
+. if defined(AUTOTOOL_autoheader)
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
+		${AUTOHEADER_ARGS})
+. endif
 . if defined(AUTOTOOL_automake)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
 		${AUTOMAKE_ARGS})
@@ -338,10 +342,6 @@
 . if defined(AUTOTOOL_autoconf)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
 		${AUTOCONF_ARGS})
-. endif
-. if defined(AUTOTOOL_autoheader)
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
-		${AUTOHEADER_ARGS})
 . endif
 .endif
 
------------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted: