* 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)

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)
 ])
 

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)

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