* configure.in: AC_REQUIRE is not valid outside of AC_DEFUN.

* automake/dpkg.m4: DPKG_CACHED_TRY_COMPILE was defined with both
AC_DEFUN() AND define().

ChangeLog

@@ -1,3 +1,9 @@
+Mon May 28 22:54:35 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * configure.in: AC_REQUIRE is not valid outside of AC_DEFUN.
+  * automake/dpkg.m4: DPKG_CACHED_TRY_COMPILE was defined with both
+    AC_DEFUN() AND define().
+ 
 Mon May 28 19:07:15 CDT 2001 Adam Heath <doogie@debian.org>
 
   * debian/changelog: Update for 1.9.7.

automake/dpkg.m4

@@ -43,16 +43,3 @@ AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[
  fi
 ])
 dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-define(DPKG_CACHED_TRY_COMPILE,[
- AC_MSG_CHECKING($1)
- AC_CACHE_VAL($2,[
-  AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
- ])
- if test "x$$2" = xyes; then
-  true
-  $5
- else
-  true
-  $6
- fi
-])

configure.in

@@ -83,8 +83,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
 fi
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
-AC_REQUIRE([AC_ARG_PROGRAM])
-AC_REQUIRE([AC_PROG_MAKE_SET])
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
 
 AC_MSG_CHECKING(dpkg version)
 AC_MSG_RESULT($VERSION)