don't try to detect glibc and libstdc++ version as we don't need this information...

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 5fca48d5accdeb4ba302be05f33746079417ff8f..fdac3e6c3ec6b9c77c28c9634f17433497bed9f9 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -9,8 +9,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@
-GLIBC_VER = @GLIBC_VER@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC

diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 9a8d744f2267daeefea59f95e809c46b34f67592..d1d6923318226490703b75060ecbeb95d597091a 100644 (file)
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -89,56 +89,6 @@ AC_DEFUN(ah_NUM_PROCS,
        AC_SUBST(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>
-#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 > /dev/null 2>&1
-       if test "$?" = 0; then
-               GLIBC_VER=`./$dummy`
-               AC_MSG_RESULT([$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)
-])
-
-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 > /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.\(.*\)/\3\2/'`
-       fi
-       rm -f $dummy $dummy.cc
-
-       if test -z "$LIBSTDCPP_VER"; then
-               AC_MSG_WARN([cannot determine standard C++ library version number])
-       else
-               AC_MSG_RESULT([$LIBSTDCPP_VER])
-               LIBSTDCPP_VER="-$LIBSTDCPP_VER"
-       fi
-       AC_SUBST(LIBSTDCPP_VER)
-])
-
 AC_DEFUN(ah_GCC3DEP,[
        AC_MSG_CHECKING(if $CXX -MD works)
        touch gcc3dep.cc

diff --git a/configure.in b/configure.in
index 9bcb940684723053def7933bd8fae4cf3ca3014d..fe30d4ca1d704defb3473053af4519b09085942d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -197,8 +197,6 @@ DOTDIR=$(dirname $DOT)
 AC_SUBST(DOTDIR)
 
 ah_NUM_PROCS
-rc_GLIBC_VER
-rc_LIBSTDCPP_VER
 ah_GCC3DEP
 
 dnl It used to be that the user could select translations and that could get