Rejigger gettext stuff for 0.11.5

[apt.git] / buildlib / tools.m4

diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 281a4ec1dfe916da9ca45b8879e87c1f1d3f7f0e..442c0b6ae2b7d1c3df2ec26214a4b0298ed6ec6d 100644 (file)
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -89,15 +89,16 @@ AC_DEFUN(ah_NUM_PROCS,
        AC_SUBST(NUM_PROCS)
 ])
 
-AC_DEFUN(ah_GLIBC_VER,
+AC_DEFUN(rc_GLIBC_VER,
        [AC_MSG_CHECKING([glibc version])
        dummy=if$$
        cat <<_GLIBC_>$dummy.c
 #include <features.h>
 #include <stdio.h>
+#include <stdlib.h>
 int main(int argc, char **argv) { printf("libc6.%d",__GLIBC_MINOR__); exit(0); }
 _GLIBC_
-       ${CC-cc} $dummy.c -o $dummy
+       ${CC-cc} $dummy.c -o $dummy > /dev/null 2>&1
        if test "$?" = 0; then
                GLIBC_VER=`./$dummy`
                AC_MSG_RESULT([$GLIBC_VER])
@@ -109,19 +110,20 @@ _GLIBC_
        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
 #include <features.h>
 #include <stdio.h>
+#include <stdlib.h>
 int main(int argc, char **argv) { exit(0); }
 _LIBSTDCPP_
-       ${CXX-c++} $dummy.cc -o $dummy
+       ${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1
 
        if test "$?" = 0; then
                soname=`objdump -p ./$dummy |grep NEEDED|grep libstd`
-               LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++-libc.*-\(.*\).so.\(.*\)/\2-\1/'`
+                LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'`
        fi
        rm -f $dummy $dummy.cc
 
@@ -133,3 +135,23 @@ _LIBSTDCPP_
        fi
        AC_SUBST(LIBSTDCPP_VER)
 ])
+
+AC_DEFUN(ah_GCC3DEP,[
+       AC_MSG_CHECKING(if $CXX -MD works)
+       touch gcc3dep.cc
+       ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc
+       rm -f gcc3dep.cc gcc3dep_test.o
+       if test -e gcc3dep.d; then
+               rm -f gcc3dep.d
+               GCC_MD=input
+               GCC3DEP=
+       elif test -e gcc3dep_test.d; then
+               rm -f gcc3dep_test.d
+               GCC_MD=output
+               GCC3DEP=yes
+       else
+               AC_MSG_ERROR(no)
+       fi
+       AC_MSG_RESULT([yes, for $GCC_MD])
+       AC_SUBST(GCC3DEP)
+])