patch: fix underquoted AC_DEFUNs

[Alexandre Duret-Lutz]

Hi people,

Starting with Automake 1.8, aclocal will warn about underquoted
calls to AC_DEFUN.  The doc reads as follows

| Writing your own aclocal macros
| ===============================
| 
| The `aclocal' program doesn't have any built-in knowledge of any
| macros, so it is easy to extend it with your own macros.
| 
|    This can be used by libraries which want to supply their own Autoconf
| macros for use by other programs.  For instance the `gettext' library
| supplies a macro `AM_GNU_GETTEXT' which should be used by any package
| using `gettext'.  When the library is installed, it installs this macro
| so that `aclocal' will find it.
| 
|    A macro file's name should end in `.m4'.  Such files should be
| installed in `$(datadir)/aclocal'.  This is as simple as writing:
| 
|      aclocaldir = $(datadir)/aclocal
|      aclocal_DATA = mymacro.m4 myothermacro.m4
| 
|    A file of macros should be a series of properly quoted `AC_DEFUN''s
| (*note Macro Definitions: (autoconf)Macro Definitions.).  The `aclocal'
| programs also understands `AC_REQUIRE' (*note Prerequisite Macros:
| (autoconf)Prerequisite Macros.), so it is safe to put each macro in a
| separate file.  Each file should have no side effects but macro
| definitions.  Especially, any call to `AC_PREREQ' should be done inside
| the defined macro, not at the beginning of the file.
| 
|    Starting with Automake 1.8, `aclocal' will warn about all
| underquoted calls to `AC_DEFUN'.  We realize this will annoy a lot of
| people, because `aclocal' was not so strict in the past and many third
| party macros are underquoted; and we have to apologize for this
| temporary inconvenience.  The reason we have to be stricter is that a
| future implementation of `aclocal' (*note Future of aclocal::) will
| have to temporary include all these third party `.m4' files, maybe
| several times, even those which are not actually needed.  Doing so
| should alleviate many problem of the current implementation, however it
| requires a stricter style from the macro authors.  Hopefully it is easy
| to revise the existing macros.  For instance
|      # bad style
|      AC_PREREQ(2.57)
|      AC_DEFUN(AX_FOOBAR,
|      [AC_REQUIRE([AX_SOMETHING])dnl
|      AX_FOO
|      AX_BAR
|      ])
| 
| should be rewritten as
|      AC_DEFUN([AX_FOOBAR],
|      [AC_PREREQ(2.57)dnl
|      AC_REQUIRE([AX_SOMETHING])dnl
|      AX_FOO
|      AX_BAR
|      ])
| 
|    Wrapping the `AC_PREREQ' call inside the macro ensures that Autoconf
| 2.57 will not be required if `AX_FOOBAR' is not actually used.  Most
| importantly, quoting the first argument of `AC_DEFUN' allows the macro
| to be redefined or included twice (otherwise this first argument would
| be expansed during the second definition).
| 
|    If you have been directed here by the `aclocal' diagnostic but are
| not the maintainer of the implicated macro, you will want to contact
| the maintainer of that macro.  Please make sure you have the last
| version of the macro and that the problem already hasn't been reported
| before doing so: people tend to work faster when they aren't flooded by
| mails.

The following patch corrects all uses of AC_DEFUN in the ac-archives,
and also moves one "external" AC_PREREQ inside its macro (which I wrote, 
as a matter of fact).

Index: legacy/c_support/ac_check_cc_opt.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/c_support/ac_check_cc_opt.m4,v
retrieving revision 1.3
diff -u -r1.3 ac_check_cc_opt.m4
--- legacy/c_support/ac_check_cc_opt.m4 25 Jan 2003 02:21:31 -0000      1.3
+++ legacy/c_support/ac_check_cc_opt.m4 31 Aug 2003 22:14:14 -0000
@@ -1,15 +1,15 @@
 dnl @synopsis AC_CHECK_CC_OPT(flag, cachevarname)
 dnl obsoleted - use CFLAGS/CXXFLAGS related macros as soon as possible
-dnl 
+dnl
 dnl AC_CHECK_CC_OPT(-fvomit-frame,vomitframe)
-dnl would show a message as like 
+dnl would show a message as like
 dnl "checking wether gcc accepts -fvomit-frame ... no"
 dnl and sets the shell-variable $vomitframe to either "-fvomit-frame"
-dnl or (in this case) just a simple "". In many cases you would then call 
+dnl or (in this case) just a simple "". In many cases you would then call
 dnl AC_SUBST(_fvomit_frame_,$vomitframe) to create a substitution that
 dnl could be fed as "CFLAGS = @_funsigned_char_@ @_fvomit_frame_@
 dnl
-dnl in consequence this function is much more general than their 
+dnl in consequence this function is much more general than their
 dnl specific counterparts like ac_cxx_rtti.m4 that will test for
 dnl -fno-rtti -fno-exceptions
 dnl
@@ -18,11 +18,11 @@
 dnl directly to the CFLAGS/CXXFLAGS unless a ac_subst-variable was given.
 dnl Remind me of doing so if I forget about writing it all up - to use
 dnl $CC-cc directly in here instead of ac_compile macro is bad anyway.
-dnl 
+dnl
 dnl @version $Id: ac_check_cc_opt.m4,v 1.3 2003/01/25 02:21:31 guidod Exp $
 dnl @author  Guido Draheim <address@hidden>
 
-AC_DEFUN(AC_CHECK_CC_OPT,
+AC_DEFUN([AC_CHECK_CC_OPT],
 [AC_CACHE_CHECK(whether ${CC-cc} accepts [$1], [$2],
 [AC_SUBST($2)
 echo 'void f(){}' > conftest.c
@@ -33,4 +33,3 @@
 fi
 rm -f conftest*
 ])])
-
Index: legacy/installed_packages/ac_caolan_check_package.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/ac_caolan_check_package.m4,v
retrieving revision 1.6
diff -u -r1.6 ac_caolan_check_package.m4
--- legacy/installed_packages/ac_caolan_check_package.m4        25 Sep 2002 
13:59:14 -0000      1.6
+++ legacy/installed_packages/ac_caolan_check_package.m4        31 Aug 2003 
22:14:15 -0000
@@ -1,18 +1,18 @@
 dnl @synopsis AC_caolan_CHECK_PACKAGE(PACKAGE, FUNCTION, LIBRARY , HEADERFILE 
[, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl
 dnl Provides --with-PACKAGE, --with-PACKAGE-include and --with-PACKAGE-libdir
-dnl options to configure. Supports the now standard --with-PACKAGE=DIR 
+dnl options to configure. Supports the now standard --with-PACKAGE=DIR
 dnl approach where the package's include dir and lib dir are underneath DIR,
 dnl but also allows the include and lib directories to be specified seperately
 dnl
-dnl adds the extra -Ipath to CFLAGS if needed 
+dnl adds the extra -Ipath to CFLAGS if needed
 dnl adds extra -Lpath to LD_FLAGS if needed
-dnl searches for the FUNCTION in the LIBRARY with 
+dnl searches for the FUNCTION in the LIBRARY with
 dnl AC_CHECK_LIBRARY and thus adds the lib to LIBS
 dnl
-dnl defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the 
+dnl defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the
 dnl HAVE_PKG_PACKAGE is replaced with the actual first parameter passed)
-dnl note that autoheader will complain of not having the HAVE_PKG_PACKAGE and 
you 
+dnl note that autoheader will complain of not having the HAVE_PKG_PACKAGE and 
you
 dnl will have to add it to acconfig.h manually
 dnl
 dnl @version $Id: ac_caolan_check_package.m4,v 1.6 2002/09/25 13:59:14 simons 
Exp $
@@ -22,14 +22,14 @@
 dnl Alexandre Duret-Lutz <address@hidden>
 dnl Matthew Mueller <address@hidden>
 
-AC_DEFUN(AC_caolan_CHECK_PACKAGE,
+AC_DEFUN([AC_caolan_CHECK_PACKAGE],
 [
 
 AC_ARG_WITH($1,
 [  --with-$1[=DIR]     root directory of $1 installation],
-with_$1=$withval 
+with_$1=$withval
 if test "${with_$1}" != yes; then
-       $1_include="$withval/include" 
+       $1_include="$withval/include"
        $1_libdir="$withval/lib"
 fi
 )
@@ -40,7 +40,7 @@
 
 AC_ARG_WITH($1-libdir,
 [  --with-$1-libdir=DIR        specify exact library dir for $1 library
-  --without-$1        disables $1 usage completely], 
+  --without-$1        disables $1 usage completely],
 $1_libdir="$withval")
 
 if test "${with_$1}" != no ; then
@@ -63,7 +63,7 @@
        if test "$no_good" = yes; then
 dnl    broken
                ifelse([$6], , , [$6])
-               
+
                LIBS=$OLD_LIBS
                LDFLAGS=$OLD_LDFLAGS
                CPPFLAGS=$OLD_CPPFLAGS
Index: legacy/installed_packages/ac_caolan_search_package.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/ac_caolan_search_package.m4,v
retrieving revision 1.6
diff -u -r1.6 ac_caolan_search_package.m4
--- legacy/installed_packages/ac_caolan_search_package.m4       25 Sep 2002 
13:59:14 -0000      1.6
+++ legacy/installed_packages/ac_caolan_search_package.m4       31 Aug 2003 
22:14:15 -0000
@@ -1,18 +1,18 @@
 dnl @synopsis AC_caolan_SEARCH_PACKAGE(PACKAGE, FUNCTION, LIBRARY LIST, 
HEADERFILE [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl
 dnl Provides --with-PACKAGE, --with-PACKAGE-include and --with-PACKAGE-libdir
-dnl options to configure. Supports the now standard --with-PACKAGE=DIR 
+dnl options to configure. Supports the now standard --with-PACKAGE=DIR
 dnl approach where the package's include dir and lib dir are underneath DIR,
 dnl but also allows the include and lib directories to be specified seperately
 dnl
-dnl adds the extra -Ipath to CFLAGS if needed 
+dnl adds the extra -Ipath to CFLAGS if needed
 dnl adds extra -Lpath to LD_FLAGS if needed
-dnl searches for the FUNCTION in each of the LIBRARY LIST with 
+dnl searches for the FUNCTION in each of the LIBRARY LIST with
 dnl AC_SEARCH_LIBRARY and thus adds the lib to LIBS
 dnl
-dnl defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the 
+dnl defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the
 dnl HAVE_PKG_PACKAGE is replaced with the actual first parameter passed)
-dnl note that autoheader will complain of not having the HAVE_PKG_PACKAGE and 
you 
+dnl note that autoheader will complain of not having the HAVE_PKG_PACKAGE and 
you
 dnl will have to add it to acconfig.h manually
 dnl
 dnl @version $Id: ac_caolan_search_package.m4,v 1.6 2002/09/25 13:59:14 simons 
Exp $
@@ -22,14 +22,14 @@
 dnl Alexandre Duret-Lutz <address@hidden>
 dnl Matthew Mueller <address@hidden>
 
-AC_DEFUN(AC_caolan_SEARCH_PACKAGE,
+AC_DEFUN([AC_caolan_SEARCH_PACKAGE],
 [
 
 AC_ARG_WITH($1,
 [  --with-$1[=DIR]     root directory of $1 installation],
-with_$1=$withval 
+with_$1=$withval
 if test "${with_$1}" != yes; then
-       $1_include="$withval/include" 
+       $1_include="$withval/include"
        $1_libdir="$withval/lib"
 fi
 )
@@ -40,7 +40,7 @@
 
 AC_ARG_WITH($1-libdir,
 [  --with-$1-libdir=DIR        specify exact library dir for $1 library
-  --without-$1        disables $1 usage completely], 
+  --without-$1        disables $1 usage completely],
 $1_libdir="$withval")
 
 if test "${with_$1}" != no ; then
Index: legacy/installed_packages/ac_jni_include_dirs.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/ac_jni_include_dirs.m4,v
retrieving revision 1.1
diff -u -r1.1 ac_jni_include_dirs.m4
--- legacy/installed_packages/ac_jni_include_dirs.m4    20 Sep 2001 11:58:31 
-0000      1.1
+++ legacy/installed_packages/ac_jni_include_dirs.m4    31 Aug 2003 22:14:15 
-0000
@@ -30,7 +30,7 @@
 dnl @author Don Anderson <address@hidden>
 dnl @version $Id: ac_jni_include_dirs.m4,v 1.1 2001/09/20 11:58:31 simons Exp $
 dnl
-AC_DEFUN(AC_JNI_INCLUDE_DIR,[
+AC_DEFUN([AC_JNI_INCLUDE_DIR],[
 
 JNI_INCLUDE_DIRS=""
 
@@ -78,7 +78,7 @@
 # Follows symbolic links on <path>,
 # finally setting variable _ACJNI_FOLLOWED
 # --------------------
-AC_DEFUN(_ACJNI_FOLLOW_SYMLINKS,[
+AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
 # find the include directory relative to the javac executable
 _cur="$1"
 while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
Index: legacy/installed_packages/ac_prog_cp_s.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/ac_prog_cp_s.m4,v
retrieving revision 1.3
diff -u -r1.3 ac_prog_cp_s.m4
--- legacy/installed_packages/ac_prog_cp_s.m4   2 Feb 2003 18:19:38 -0000       
1.3
+++ legacy/installed_packages/ac_prog_cp_s.m4   31 Aug 2003 22:14:15 -0000
@@ -7,7 +7,7 @@
 dnl filesystem does not know about symbolic links and you need a copy of
 dnl original file to have the same text in both places).
 dnl In a gnu environment it will simply set CP_S="cp -s" since the gnu
-dnl "cp"-command has the "-s" flag. You shall not try to use this 
+dnl "cp"-command has the "-s" flag. You shall not try to use this
 dnl command on directories since it would require a "-r" in the case of
 dnl a copy that is not supported explicitly here. (I'm not sure if some
 dnl "cp"-commands out there would barf at usage of "-r" on a normal file).
@@ -16,14 +16,14 @@
 dnl supports it then a symbolic link is created - a process that is
 dnl quicker and space-saving. However, if the target fs does not
 dnl support symbolic links, just copy the data. Unlike ac_prog_ln_s
-dnl this macro will never fail to set the CP_S ac_subst to something 
+dnl this macro will never fail to set the CP_S ac_subst to something
 dnl that works.
 dnl
 dnl @, (rarely used)
 dnl @version $Id: ac_prog_cp_s.m4,v 1.3 2003/02/02 18:19:38 guidod Exp $
 dnl @author  Guido Draheim <address@hidden>
 
-AC_DEFUN(AC_PROG_CP_S,
+AC_DEFUN([AC_PROG_CP_S],
 [AC_REQUIRE([AC_PROG_LN_S])dnl
 AC_MSG_CHECKING(whether cp -s works)
 AC_CACHE_VAL(ac_cv_prog_CP_S,
@@ -48,4 +48,3 @@
 fi
 AC_SUBST(CP_S)dnl
 ])
-
Index: legacy/installed_packages/adl_func_getopt_long.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/adl_func_getopt_long.m4,v
retrieving revision 1.2
diff -u -r1.2 adl_func_getopt_long.m4
--- legacy/installed_packages/adl_func_getopt_long.m4   19 Jan 2003 22:01:18 
-0000      1.2
+++ legacy/installed_packages/adl_func_getopt_long.m4   31 Aug 2003 22:14:15 
-0000
@@ -12,10 +12,9 @@
 dnl @version $Id: adl_func_getopt_long.m4,v 1.2 2003/01/19 22:01:18 simons Exp 
$
 dnl @author Alexandre Duret-Lutz <address@hidden>
 
-AC_PREREQ(2.49)
-
 AC_DEFUN([adl_FUNC_GETOPT_LONG],
- [# clean out junk possibly left behind by a previous configuration
+ [AC_PREREQ(2.49)dnl
+  # clean out junk possibly left behind by a previous configuration
   rm -f lib/getopt.h
   # Check for getopt_long support
   AC_CHECK_HEADERS([getopt.h])
Index: legacy/installed_packages/am_with_mpatrol.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/installed_packages/am_with_mpatrol.m4,v
retrieving revision 1.1
diff -u -r1.1 am_with_mpatrol.m4
--- legacy/installed_packages/am_with_mpatrol.m4        22 May 2001 08:49:38 
-0000      1.1
+++ legacy/installed_packages/am_with_mpatrol.m4        31 Aug 2003 22:14:15 
-0000
@@ -14,7 +14,7 @@
 dnl @version $Id: am_with_mpatrol.m4,v 1.1 2001/05/22 08:49:38 simons Exp $
 dnl @author Graeme S. Roy <address@hidden>
 dnl
-AC_DEFUN(AM_WITH_MPATROL, [
+AC_DEFUN([AM_WITH_MPATROL], [
   # Firstly, determine if the mpatrol library should be used.
 
   AC_MSG_CHECKING(if mpatrol should be used)
Index: legacy/installed_packages/sg_afs.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/installed_packages/sg_afs.m4,v
retrieving revision 1.1
diff -u -r1.1 sg_afs.m4
--- legacy/installed_packages/sg_afs.m4 1 Aug 2001 07:22:45 -0000       1.1
+++ legacy/installed_packages/sg_afs.m4 31 Aug 2003 22:14:15 -0000
@@ -20,7 +20,7 @@
 dnl @version $Id: sg_afs.m4,v 1.1 2001/08/01 07:22:45 simons Exp $
 dnl @author Scott Grosch <address@hidden>
 dnl
-AC_DEFUN(SG_AFS,
+AC_DEFUN([SG_AFS],
 [AC_ARG_WITH(afsdir, AC_HELP_STRING([--with-afsdir=DIR],
                                       [Directory holding AFS includes/libs]),
                 sg_cv_with_afsdir=$withval)
Index: legacy/misc/ac_caolan_func_which_gethostbyname_r.m4
===================================================================
RCS file: 
/cvsroot/ac-archive/ac-archive/legacy/misc/ac_caolan_func_which_gethostbyname_r.m4,v
retrieving revision 1.1
diff -u -r1.1 ac_caolan_func_which_gethostbyname_r.m4
--- legacy/misc/ac_caolan_func_which_gethostbyname_r.m4 30 Aug 2000 08:50:09 
-0000      1.1
+++ legacy/misc/ac_caolan_func_which_gethostbyname_r.m4 31 Aug 2003 22:14:15 
-0000
@@ -17,7 +17,7 @@
 dnl @version $Id: ac_caolan_func_which_gethostbyname_r.m4,v 1.1 2000/08/30 
08:50:09 simons Exp $
 dnl @author Caolan McNamara <address@hidden>
 dnl
-AC_DEFUN(AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R,
+AC_DEFUN([AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R],
 [AC_CACHE_CHECK(for which type of gethostbyname_r, 
ac_cv_func_which_gethostname_r, [
 AC_CHECK_FUNC(gethostbyname_r, [
         AC_TRY_COMPILE([
Index: legacy/misc/ac_cond_with_level.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/misc/ac_cond_with_level.m4,v
retrieving revision 1.1
diff -u -r1.1 ac_cond_with_level.m4
--- legacy/misc/ac_cond_with_level.m4   27 Apr 2001 12:42:26 -0000      1.1
+++ legacy/misc/ac_cond_with_level.m4   31 Aug 2003 22:14:15 -0000
@@ -11,7 +11,7 @@
 dnl 1 = some
 dnl 2 = many
 dnl 3 = all
-dnl 4 = extra 
+dnl 4 = extra
 dnl 5 = extrasome more
 dnl 6 = extramany muchmore much
 dnl 7 = super everything
@@ -27,7 +27,7 @@
 dnl @version $Id: ac_cond_with_level.m4,v 1.1 2001/04/27 12:42:26 simons Exp $
 dnl @author Guido Draheim <address@hidden>
 
-AC_DEFUN(AC_COND_WITH_LEVEL,
+AC_DEFUN([AC_COND_WITH_LEVEL],
 [dnl the names to be defined...
 pushdef([WITH_VAR],    patsubst(with_$1, -, _))dnl
 pushdef([VAR_WITH],    patsubst(translit(with_$1, [a-z], [A-Z]), -, _))dnl
@@ -38,18 +38,18 @@
 AC_SUBST(VAR_WITHOUT)
 AC_SUBST(VAR_WITHVAL)
 AC_SUBST(VAR_WITHDEF)
-if test -z "$WITH_VAR" 
-   then WITH_VAR=`echo ifelse([$2], , no, [$2])` 
+if test -z "$WITH_VAR"
+   then WITH_VAR=`echo ifelse([$2], , no, [$2])`
 fi
-if test "$WITH_VAR" = "yes" 
-   then WITH_VAR=`echo ifelse([$3], , some, [$3])` 
+if test "$WITH_VAR" = "yes"
+   then WITH_VAR=`echo ifelse([$3], , some, [$3])`
 fi
 if test "$WITH_VAR" != "no"; then
   VAR_WITH=    ; VAR_WITHOUT='#'
   case "$WITH_VAR" in
     9|9,*|ultrasome|ultrasome,*|insane)                                
withval=9
                VAR_WITHVAL=9 ;  VAR_WITHDEF="-D""VAR_WITH=9" ;;
-    8|8,*|ultra|ultra,*|experimental)                          withval=8 
+    8|8,*|ultra|ultra,*|experimental)                          withval=8
                 VAR_WITHVAL=8 ;  VAR_WITHDEF="-D""VAR_WITH=8" ;;
     7|7,*|muchmore|somemanymore|somemanymore,*|all)            withval=7
                VAR_WITHVAL=7 ;  VAR_WITHDEF="-D""VAR_WITH=7" ;;
@@ -81,7 +81,7 @@
 ])
 
 dnl and the same as AC_COND_WITH_LEVEL with an AC_DEFINE in the end...
-AC_DEFUN(AC_COND_WITH_LEVEL_DEFINE,
+AC_DEFUN([AC_COND_WITH_LEVEL_DEFINE],
 [dnl the names to be defined...
 pushdef([WITH_VAR],    patsubst(with_$1, -, _))dnl
 pushdef([VAR_WITH],    patsubst(translit(with_$1, [a-z], [A-Z]), -, _))dnl
@@ -92,18 +92,18 @@
 AC_SUBST(VAR_WITHOUT)
 AC_SUBST(VAR_WITHVAL)
 AC_SUBST(VAR_WITHDEF)
-if test -z "$WITH_VAR"  
-   then WITH_VAR=`echo ifelse([$2], , no, [$2])` 
+if test -z "$WITH_VAR"
+   then WITH_VAR=`echo ifelse([$2], , no, [$2])`
 fi
-if test "$WITH_VAR" = "yes" 
-   then WITH_VAR=`echo ifelse([$3], , some, [$3])`  
+if test "$WITH_VAR" = "yes"
+   then WITH_VAR=`echo ifelse([$3], , some, [$3])`
 fi
 if test "$WITH_VAR" != "no"; then
   VAR_WITH=    ; VAR_WITHOUT='#'
   case "$WITH_VAR" in
     9|9,*|ultrasome|ultrasome,*|insane)                                
withval=9
                VAR_WITHVAL=9 ;  VAR_WITHDEF="-D""VAR_WITH=9" ;;
-    8|8,*|ultra|ultra,*|experimental)                          withval=8 
+    8|8,*|ultra|ultra,*|experimental)                          withval=8
                 VAR_WITHVAL=8 ;  VAR_WITHDEF="-D""VAR_WITH=8" ;;
     7|7,*|muchmore|somemanymore|somemanymore,*|all)            withval=7
                VAR_WITHVAL=7 ;  VAR_WITHDEF="-D""VAR_WITH=7" ;;
@@ -135,6 +135,3 @@
 popdef([VAR_WITHDEF])dnl
 popdef([WITH_VAR])dnl
 ])
-
-
-
Index: legacy/misc/ac_define_versionlevel.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/misc/ac_define_versionlevel.m4,v
retrieving revision 1.2
diff -u -r1.2 ac_define_versionlevel.m4
--- legacy/misc/ac_define_versionlevel.m4       25 Jan 2003 02:43:42 -0000      
1.2
+++ legacy/misc/ac_define_versionlevel.m4       31 Aug 2003 22:14:15 -0000
@@ -27,9 +27,9 @@
 dnl        2.2.18        2020018
 dnl        2.0.112       2000112
 dnl        2.4.2         2040002
-dnl        2.4.2-pre     2040003 
+dnl        2.4.2-pre     2040003
 dnl        2.4.2-pre5    2040003
-dnl        5.0-build125  5000125 
+dnl        5.0-build125  5000125
 dnl        5.0           5000000
 dnl        0.30.17       30017
 dnl
@@ -37,7 +37,7 @@
 dnl @author Guido Draheim <address@hidden>
 dnl
 
-AC_DEFUN(AC_DEFINE_VERSIONLEVEL,
+AC_DEFUN([AC_DEFINE_VERSIONLEVEL],
 [
 ac_versionlevel_strdf=`echo ifelse($2, , $VERSION, $2) | sed -e 
's:[[A-Z-]]*:.:' -e 's:[[^0-9.]]::g' -e 's:^[[.]]*::'`
 AC_MSG_CHECKING(versionlevel $ac_versionlevel_strdf)
@@ -103,4 +103,3 @@
 AC_MSG_RESULT($[$1])
 AC_DEFINE_UNQUOTED( $1, $[$1], ifelse( $3, , $PACKAGE versionlevel, $3))
 ])
-
Index: legacy/misc/ac_subdir_files.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/misc/ac_subdir_files.m4,v
retrieving revision 1.2
diff -u -r1.2 ac_subdir_files.m4
--- legacy/misc/ac_subdir_files.m4      2 Feb 2003 18:18:51 -0000       1.2
+++ legacy/misc/ac_subdir_files.m4      31 Aug 2003 22:14:15 -0000
@@ -13,17 +13,17 @@
 dnl @version $Id: ac_subdir_files.m4,v 1.2 2003/02/02 18:18:51 guidod Exp $
 dnl @author  Guido Draheim <address@hidden>
 
-AC_DEFUN(AC_SUBDIR_FILES,
+AC_DEFUN([AC_SUBDIR_FILES],
 [AC_BEFORE($0,[AC_CP_S])
   for ac_subdir in ifelse([$1], , *, $1) ; do
-    if test -d $ac_subdir ; then 
+    if test -d $ac_subdir ; then
       AC_MSG_CHECKING(subdir $ac_subdir)
-      for ac_file in $ac_subdir/* ; do 
+      for ac_file in $ac_subdir/* ; do
        if test -f $ac_file ; then
          if test ! -e `basename $ac_file` ; then
            case `basename $ac_file` in
-             ifelse([$2], , *.?|*.cc|*.cpp,[$1])) 
-               AC_ECHO_N($ac_file,) ; 
+             ifelse([$2], , *.?|*.cc|*.cpp,[$1]))
+               AC_ECHO_N($ac_file,) ;
                 $CP_S $ac_file . ;;
             esac
           fi
@@ -33,4 +33,3 @@
     fi
   done
 ])
-
Index: legacy/misc/ac_sys_dev_poll.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/misc/ac_sys_dev_poll.m4,v
retrieving revision 1.2
diff -u -r1.2 ac_sys_dev_poll.m4
--- legacy/misc/ac_sys_dev_poll.m4      22 May 2001 08:35:42 -0000      1.2
+++ legacy/misc/ac_sys_dev_poll.m4      31 Aug 2003 22:14:15 -0000
@@ -12,7 +12,7 @@
 dnl @version $Id: ac_sys_dev_poll.m4,v 1.2 2001/05/22 08:35:42 simons Exp $
 dnl @author Dave Benson <address@hidden>
 dnl
-AC_DEFUN(AC_SYS_DEV_POLL, [AC_CACHE_CHECK(for /dev/poll support, 
ac_cv_dev_poll,
+AC_DEFUN([AC_SYS_DEV_POLL], [AC_CACHE_CHECK(for /dev/poll support, 
ac_cv_dev_poll,
     AC_TRY_COMPILE([#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>

-- 
Alexandre Duret-Lutz