>Number:         30053
>Category:       pkg
>Synopsis:       automake warns about /usr/pkg/share/aclocal underquoting
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 24 20:31:00 +0000 2005
>Originator:     jklowden@schemamania.org
>Release:        NetBSD 2.0
>Organization:

>Environment:
System: NetBSD oak.schemamania.org 2.0 NetBSD 2.0 (GENERIC) #0: Wed Dec 1 10:58:25 UTC 2004 builds@build:/big/builds/ab/netbsd-2-0-RELEASE/i386/200411300000Z-obj/big/builds/ab/netbsd-2-0-RELEASE/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
autoconf (GNU Autoconf) 2.59
automake (GNU automake) 1.9.5
ltmain.sh (GNU libtool) 1.5.14

>Description:
	Cf. info automake "5.7 Writing your own aclocal macros"

	Running recent versions of automake (usually from within autoconf) 
	yields a complaint about underquoting in various macros in m4's 
	path.  I'm expert in neither automake nor m4, but I think this patch is
	all that's required.  We can maintain them as pkgsrc patches until 
	the upstream folks fix them.  
	
	Even though it's a small change -- and at present nothing's broken --
	I'm submitting this patch because the complaint appears *every* time
	automake is run, not just when these particular (guilty) packages are
	built.  The resultant noise makes it hard to discern whether something
	(possibly something new) is broken, or if it's just "the usual".  
	
	These files were installed in the last month or so from then-current
	pkgsrc.  The warnings started occurring IIRC more than a year ago.  

>How-To-Repeat:
	The manual says "Starting with Automake 1.8, `aclocal' will warn about all
underquoted calls to `AC_DEFUN'."

>Fix:
diff -u orig/ORBit.m4 ./ORBit.m4
--- orig/ORBit.m4	2005-04-17 19:17:31.000000000 -0400
+++ ./ORBit.m4	2005-04-24 15:41:30.000000000 -0400
@@ -1,7 +1,7 @@
 dnl AM_PATH_ORBIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for ORBit, and define ORBIT_CFLAGS and ORBIT_LIBS
 dnl
-AC_DEFUN(AM_PATH_ORBIT,
+AC_DEFUN([AM_PATH_ORBIT],
 [dnl 
 dnl Get the cflags and libraries from the orbit-config script
 dnl
diff -u orig/aalib.m4 ./aalib.m4
--- orig/aalib.m4	2005-04-23 00:12:34.000000000 -0400
+++ ./aalib.m4	2005-04-24 15:41:05.000000000 -0400
@@ -9,7 +9,7 @@
 dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
 dnl
-AC_DEFUN(AM_PATH_AALIB,
+AC_DEFUN([AM_PATH_AALIB],
 [dnl 
 dnl Get the cflags and libraries from the aalib-config script
 dnl
diff -u orig/audiofile.m4 ./audiofile.m4
--- orig/audiofile.m4	2005-03-27 22:30:49.000000000 -0500
+++ ./audiofile.m4	2005-04-24 15:36:18.000000000 -0400
@@ -9,7 +9,7 @@
 dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS.
 dnl
-AC_DEFUN(AM_PATH_AUDIOFILE,
+AC_DEFUN([AM_PATH_AUDIOFILE],
 [dnl 
 dnl Get compiler flags and libraries from the audiofile-config script.
 dnl
diff -u orig/glib.m4 ./glib.m4
--- orig/glib.m4	2005-04-24 15:19:39.000000000 -0400
+++ ./glib.m4	2005-04-24 15:19:39.000000000 -0400
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
diff -u orig/gtk.m4 ./gtk.m4
--- orig/gtk.m4	2005-03-27 14:21:38.000000000 -0500
+++ ./gtk.m4	2005-04-24 15:29:37.000000000 -0400
@@ -4,7 +4,7 @@
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
diff -u orig/imlib.m4 ./imlib.m4
--- orig/imlib.m4	2005-04-17 19:14:06.000000000 -0400
+++ ./imlib.m4	2005-04-24 15:32:00.000000000 -0400
@@ -6,7 +6,7 @@
 dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
 dnl
-AC_DEFUN(AM_PATH_IMLIB,
+AC_DEFUN([AM_PATH_IMLIB],
 [dnl 
 dnl Get the cflags and libraries from the imlib-config script
 dnl
@@ -164,7 +164,7 @@
 ])
 
 # Check for gdk-imlib
-AC_DEFUN(AM_PATH_GDK_IMLIB,
+AC_DEFUN([AM_PATH_GDK_IMLIB],
 [dnl 
 dnl Get the cflags and libraries from the imlib-config script
 dnl
diff -u orig/libIDL.m4 ./libIDL.m4
--- orig/libIDL.m4	2005-04-17 19:16:31.000000000 -0400
+++ ./libIDL.m4	2005-04-24 15:37:03.000000000 -0400
@@ -3,7 +3,7 @@
 dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBIDL,
+AC_DEFUN([AM_PATH_LIBIDL],
 [dnl 
 dnl Get the cflags and libraries from the libIDL-config script
 dnl
diff -u orig/libart.m4 ./libart.m4
--- orig/libart.m4	2005-04-24 15:23:12.000000000 -0400
+++ ./libart.m4	2005-04-24 15:23:12.000000000 -0400
@@ -8,7 +8,7 @@
 dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBART,
+AC_DEFUN([AM_PATH_LIBART],
 [dnl 
 dnl Get the cflags and libraries from the libart-config script
 dnl
diff -u orig/pkg.m4 ./pkg.m4
--- orig/pkg.m4	2005-03-27 14:31:28.000000000 -0500
+++ ./pkg.m4	2005-04-24 15:37:50.000000000 -0400
@@ -2,7 +2,7 @@
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
 dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
+AC_DEFUN([PKG_CHECK_MODULES], [
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
diff -u orig/speex.m4 ./speex.m4
--- orig/speex.m4	2005-04-23 00:07:35.000000000 -0400
+++ ./speex.m4	2005-04-24 15:39:51.000000000 -0400
@@ -7,7 +7,7 @@
 dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
 dnl
-AC_DEFUN(XIPH_PATH_SPEEX,
+AC_DEFUN([XIPH_PATH_SPEEX],
 [dnl 
 dnl Get the cflags and libraries
 dnl

>Unformatted:
 		pkgsrc as of Apr 23 2005