* Patch from Oliver Kurth <oku@masqmail.cx> to use AC_C...

Author: mdz
Date: 2004-01-09 07:42:54 GMT
* Patch from Oliver Kurth <oku@masqmail.cx> to use AC_CACHE_VAL for
GIBC_VER to make cross-compilation easier (Closes: #221528)

diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 442c0b6ae2b7d1c3df2ec26214a4b0298ed6ec6d..9a8d744f2267daeefea59f95e809c46b34f67592 100644 (file)
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -91,6 +91,7 @@ AC_DEFUN(ah_NUM_PROCS,
 
 AC_DEFUN(rc_GLIBC_VER,
        [AC_MSG_CHECKING([glibc version])
+       AC_CACHE_VAL(ac_cv_glibc_ver,
        dummy=if$$
        cat <<_GLIBC_>$dummy.c
 #include <features.h>
@@ -102,11 +103,13 @@ _GLIBC_
        if test "$?" = 0; then
                GLIBC_VER=`./$dummy`
                AC_MSG_RESULT([$GLIBC_VER])
-               GLIBC_VER="-$GLIBC_VER"
+               ac_cv_glibc_ver=$GLIBC_VER
        else
                AC_MSG_WARN([cannot determine GNU C library minor version number])
        fi
        rm -f $dummy $dummy.c
+       )
+       GLIBC_VER="-$ac_cv_glibc_ver"
        AC_SUBST(GLIBC_VER)
 ])
 

diff --git a/configure.in b/configure.in
index ee936a3a780dc86f0ad3b72128c369759cc6b750..e35f5450f254a989e802427af15342c89a147ba1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.5.20")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.21")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index f35314d76e48fd0ecd4ead67979ac20c49fb22b2..25a8aef4b15ebbb94666c4401a4c2592529a39c3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ apt (0.5.21) unstable; urgency=low
   * Fix typo in apt-cache(8) (Closes: #226351)
   * Clearer error message in place of "...has no available version, but
     exists in the database" (Closes: #212203)
+  * Patch from Oliver Kurth <oku@masqmail.cx> to use AC_CACHE_VAL for
+    GIBC_VER to make cross-compilation easier (Closes: #221528)
 
- --
+ -- Matt Zimmerman <mdz@debian.org>  Thu,  8 Jan 2004 23:40:29 -0800
 
 apt (0.5.20) unstable; urgency=low