merged from debian-sid

[apt.git] / buildlib / tools.m4

diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 69f643e2b3ba784f302311a248150effb82f7f67..9a8d744f2267daeefea59f95e809c46b34f67592 100644 (file)
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -89,8 +89,9 @@ AC_DEFUN(ah_NUM_PROCS,
        AC_SUBST(NUM_PROCS)
 ])
 
        AC_SUBST(NUM_PROCS)
 ])
 

-AC_DEFUN(ah_GLIBC_VER,
+AC_DEFUN(rc_GLIBC_VER,

        [AC_MSG_CHECKING([glibc version])
        [AC_MSG_CHECKING([glibc version])

+       AC_CACHE_VAL(ac_cv_glibc_ver,

        dummy=if$$
        cat <<_GLIBC_>$dummy.c
 #include <features.h>
        dummy=if$$
        cat <<_GLIBC_>$dummy.c
 #include <features.h>


@@ -102,15 +103,17 @@ _GLIBC_
        if test "$?" = 0; then
                GLIBC_VER=`./$dummy`
                AC_MSG_RESULT([$GLIBC_VER])
        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
        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)
 ])
 
        AC_SUBST(GLIBC_VER)
 ])
 

-AC_DEFUN(ah_LIBSTDCPP_VER,
+AC_DEFUN(rc_LIBSTDCPP_VER,

        [AC_MSG_CHECKING([libstdc++ version])
        dummy=if$$
        cat <<_LIBSTDCPP_>$dummy.cc
        [AC_MSG_CHECKING([libstdc++ version])
        dummy=if$$
        cat <<_LIBSTDCPP_>$dummy.cc