diff options
| author | Adam Heath <doogie@debian.org> | 2001-05-29 03:59:30 +0000 |
|---|---|---|
| committer | Adam Heath <doogie@debian.org> | 2001-05-29 03:59:30 +0000 |
| commit | 28a233a2891727d15b5bf04e8baafb4c8d281124 (patch) | |
| tree | 69e3adaeb5d2e3de1775c3633a8457403de1a832 | |
| parent | 84b744d5f61a25de4cbe881e17e55ab9361ce617 (diff) | |
| download | dpkg-28a233a2891727d15b5bf04e8baafb4c8d281124.tar.gz | |
* 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().
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | automake/dpkg.m4 | 13 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 8 insertions, 15 deletions
@@ -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. diff --git a/automake/dpkg.m4 b/automake/dpkg.m4 index fc5eb128f..c5f2611e4 100644 --- a/automake/dpkg.m4 +++ b/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 -]) diff --git a/configure.in b/configure.in index e44b306e3..76cd8538b 100644 --- a/configure.in +++ b/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) |