diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 17:04:57 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 17:04:57 +0000 |
| commit | 345e8fd09a6685c17031cd9d4788174f6d8cf19d (patch) | |
| tree | 04ebe47fa002f0fec1bddcd85e223336e60eea69 | |
| parent | 4c36e0626ecaa9585a55f595db477b5e6e6f669c (diff) | |
* 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)
| -rw-r--r-- | buildlib/tools.m4 | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index 442c0b6ae..9a8d744f2 100644 --- 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 ee936a3a7..e35f5450f 100644 --- 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 f35314d76..25a8aef4b 100644 --- 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 |