--- oaf-0.6.10/oaf.m4.am18	1999-12-03 16:09:35.000000000 +0100
+++ oaf-0.6.10/oaf.m4	2007-09-05 11:52:26.000000000 +0200
@@ -1,7 +1,7 @@
 dnl AM_PATH_OAF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for OAF, and define OAF_CFLAGS and OAF_LIBS
 dnl
-AC_DEFUN(AM_PATH_OAF,
+AC_DEFUN([AM_PATH_OAF],
 [dnl 
 dnl Get the cflags and libraries from the oaf-config script
 dnl
--- oaf-0.6.10/acinclude.m4.am18	2001-09-26 19:44:02.000000000 +0200
+++ oaf-0.6.10/acinclude.m4	2007-09-05 11:52:41.000000000 +0200
@@ -12,7 +12,7 @@
 
 # serial 5
 
-AC_DEFUN(AM_GNU_OAF_WITH_NLS,
+AC_DEFUN([AM_GNU_OAF_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -212,7 +212,7 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
     AC_SUBST(POSUB)
   ])
 
-AC_DEFUN(AM_GNU_OAF_GETTEXT,
+AC_DEFUN([AM_GNU_OAF_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
@@ -237,7 +237,7 @@ strdup __argz_count __argz_stringify __a
      AC_DEFINE(HAVE_STPCPY)
    fi
 
-   AM_LC_MESSAGES
+   gt_LC_MESSAGES
    AM_GNU_OAF_WITH_NLS
 
    if test "x$CATOBJEXT" != "x"; then