diff -up dotconf-1.0.13/dotconf.m4.m4-underquote dotconf-1.0.13/dotconf.m4
--- dotconf-1.0.13/dotconf.m4.m4-underquote	2002-09-17 23:38:08.000000000 +0530
+++ dotconf-1.0.13/dotconf.m4	2008-03-01 19:49:12.000000000 +0530
@@ -2,7 +2,7 @@
 dnl ## AM_PATH_DOTCONF([MINIMUM_VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT_FOUND]]])
 dnl ##
 dnl ##
-AC_DEFUN(AM_PATH_DOTCONF,
+AC_DEFUN([AM_PATH_DOTCONF],
 [dnl
 dnl Get the cflags and libs from the dotconf-config script
 dnl
diff -up dotconf-1.0.13/acinclude.m4.m4-underquote dotconf-1.0.13/acinclude.m4
--- dotconf-1.0.13/acinclude.m4.m4-underquote	2002-01-30 20:29:17.000000000 +0530
+++ dotconf-1.0.13/acinclude.m4	2008-03-01 19:45:18.000000000 +0530
@@ -2,10 +2,10 @@ dnl SQ_EXPAND_DIR(VARNAME, DIR)
 dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
 dnl and assigns the resulting string to VARNAME
 dnl example: SQ_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
-dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+dnl eg, then: AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR")
 dnl by Alexandre Oliva
 dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
-AC_DEFUN(SQ_EXPAND_DIR, [
+AC_DEFUN([SQ_EXPAND_DIR], [
         $1=$2
         $1=`(
             test "x$prefix" = xNONE && prefix="$ac_default_prefix"
@@ -24,7 +24,7 @@ dnl AC_PHP_ONCE(namespace, variable, cod
 dnl
 dnl execute code, if variable is not set in namespace
 dnl
-AC_DEFUN(AC_PHP_ONCE,[
+AC_DEFUN([AC_PHP_ONCE],[
   unique=`echo $ac_n "$2$ac_c" | tr -c -d a-zA-Z0-9`
   cmd="echo $ac_n \"\$$1$unique$ac_c\""
   if test -n "$unique" && test "`eval $cmd`" = "" ; then
@@ -38,7 +38,7 @@ dnl AC_EXPAND_PATH(path, variable)
 dnl
 dnl expands path to an absolute path and assigns it to variable
 dnl
-AC_DEFUN(AC_EXPAND_PATH,[
+AC_DEFUN([AC_EXPAND_PATH],[
   if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
     $2="$1"
   else
@@ -51,7 +51,7 @@ dnl AC_ADD_LIBPATH(path)
 dnl
 dnl add a library to linkpath/runpath
 dnl
-AC_DEFUN(AC_ADD_LIBPATH,[
+AC_DEFUN([AC_ADD_LIBPATH],[
   AC_EXPAND_PATH($1, ai_p)
   AC_PHP_ONCE(LIBPATH, $ai_p, [
     EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
@@ -71,7 +71,7 @@ dnl AC_ADD_INCLUDE(path)
 dnl
 dnl add a include path
 dnl
-AC_DEFUN(AC_ADD_INCLUDE,[
+AC_DEFUN([AC_ADD_INCLUDE],[
   AC_EXPAND_PATH($1, ai_p)
   AC_PHP_ONCE(INCLUDEPATH, $ai_p, [
     INCLUDES="$INCLUDES -I$ai_p"
@@ -83,7 +83,7 @@ dnl AC_ADD_LIBRARY(library)
 dnl
 dnl add a library to the link line
 dnl
-AC_DEFUN(AC_ADD_LIBRARY,[
+AC_DEFUN([AC_ADD_LIBRARY],[
   AC_PHP_ONCE(LIBRARY, $1, [
     EXTRA_LIBS="$EXTRA_LIBS -l$1"
   ])
@@ -94,7 +94,7 @@ dnl AC_ADD_LIBRARY_WITH_PATH(library, pa
 dnl
 dnl add a library to the link line and path to linkpath/runpath
 dnl
-AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[
+AC_DEFUN([AC_ADD_LIBRARY_WITH_PATH],[
   AC_ADD_LIBPATH($2)
   AC_ADD_LIBRARY($1)
 ])