fixed glibc 2.1 detection test

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 5a73ea45c6f45aba563930e9bd03c3df6e7b26b7..ee43a7be98791a370d44e959043e0a0facb85256 100755 (executable)
--- a/configure
+++ b/configure
@@ -9589,7 +9589,7 @@ else
 #include <features.h>
 int main() {
 
 #include <features.h>
 int main() {
 

-                #if !__GLIBC_PREREQ(2, 1)
+                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)

                     #error not glibc2.1
                 #endif
             
                     #error not glibc2.1
                 #endif
             

diff --git a/configure.in b/configure.in
index 0c1bf77c84dc88f8083c43a140d14bb2f72c7693..40ce4d86419dda1b50336a63321be1ccd1c8a511 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1363,11 +1363,14 @@ dnl flush the cache because checking for libraries below might abort
 AC_CACHE_SAVE
 
 dnl check for glibc version
 AC_CACHE_SAVE
 
 dnl check for glibc version

+dnl
+dnl VZ: I have no idea why had this check been there originally, but now
+dnl     it is only used to get the recursive mutexes under Linux

 if test "$USE_LINUX" = 1; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
         AC_TRY_COMPILE([#include <features.h>],
             [
 if test "$USE_LINUX" = 1; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
         AC_TRY_COMPILE([#include <features.h>],
             [

-                #if !__GLIBC_PREREQ(2, 1)
+                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)

                     #error not glibc2.1
                 #endif
             ],
                     #error not glibc2.1
                 #endif
             ],