>Number:         18556
>Category:       pkg
>Synopsis:       new pkgsrc mk/auto{conf,make}.mk should do more by default
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 06 14:11:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Greg A. Woods
>Release:        pkgsrc-current 2002/10/05
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD 1.5W
>Description:

	The mk/automake.mk and mk/autoconf.mk infrastructure files for
	supporting GNU Auto{conf,make} in pgksrc should provide an
	appropriate default definition for the pre-configure target, as
	well as turning on other options which are also required
	whenever these tools are used (USE_GMAKE and GNU_CONFIGURE).

>How-To-Repeat:

>Fix:

Index: automake.mk
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/mk/automake.mk,v
retrieving revision 1.2
diff -c -r1.2 automake.mk
*** automake.mk	3 Oct 2002 19:36:36 -0000	1.2
--- automake.mk	6 Oct 2002 19:59:13 -0000
***************
*** 13,18 ****
--- 13,20 ----
  .if !defined(AUTOMAKE_MK)
  AUTOMAKE_MK=	# defined
  
+ USE_GMAKE=	yes
+ 
  # minimal required version
  AUTOMAKE_REQD?= 1.7
  
***************
*** 28,33 ****
--- 30,44 ----
  
  AUTOMAKE=		${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
  ACLOCAL=		${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
+ 
+ .if !target(pre-configure)
+ # We have patched Makefile.in and maybe configure.in -- re-automake/re-autoconf it...
+ pre-configure:
+ 	cd ${WRKSRC} &&	${ACLOCAL}
+ 	cd ${WRKSRC} &&	${AUTOHEADER}
+ 	cd ${WRKSRC} &&	${AUTOMAKE} --add-missing
+ 	cd ${WRKSRC} &&	${AUTORECONF} --force
+ .endif
  
  .include "../../mk/autoconf.mk"
  .endif # AUTOMAKE_MK
Index: autoconf.mk
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/mk/autoconf.mk,v
retrieving revision 1.3
diff -c -r1.3 autoconf.mk
*** autoconf.mk	3 Oct 2002 19:36:36 -0000	1.3
--- autoconf.mk	6 Oct 2002 19:59:40 -0000
***************
*** 12,17 ****
--- 12,19 ----
  .if !defined(AUTOCONF_MK)
  AUTOCONF_MK=	# defined
  
+ GNU_CONFIGURE=	yes
+ 
  # minimal required version
  AUTOCONF_REQD?= 2.50
  
***************
*** 25,30 ****
--- 27,38 ----
  AUTOCONF=		${LOCALBASE}/bin/autoconf-2.13
  AUTORECONF=		${LOCALBASE}/bin/autoreconf-2.13
  AUTOHEADER=		${LOCALBASE}/bin/autoheader-2.13
+ .endif
+ 
+ .if !target(pre-configure)
+ # We have patched configure.in -- re-autoconf it...
+ pre-configure:
+ 	cd ${WRKSRC} &&	${AUTORECONF} --force
  .endif
  
  .endif # AUTOCONF_MK
>Release-Note:
>Audit-Trail:
>Unformatted: