ncurses 6.1 - patch 20181215

[ncurses.git] / Ada95 / aclocal.m4

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index b16d222f476530395cd39a4831eeabc4efdec398..bbb14ab2e5ac4c3bc8f4049f6a8a33faae57046d 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.140 2018/12/01 21:07:22 tom Exp $
+dnl $Id: aclocal.m4,v 1.141 2018/12/15 19:54:31 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1508,7 +1508,7 @@ case $cf_gnat_version in
 esac
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_GNU_SOURCE version: 9 updated: 2018/06/20 20:23:13
+dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
@@ -1527,6 +1527,8 @@ AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[
 AC_TRY_COMPILE([#include <sys/types.h>],[
        #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0
                return 0;
+       #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0
+               return 0;
        #else
        #       error not GNU C library
        #endif],
@@ -1537,13 +1539,16 @@ AC_TRY_COMPILE([#include <sys/types.h>],[
 if test x$cf_cv_gnu_library = xyes; then
 
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
-       # was changed to help a little...
+       # was changed to help a little.  newlib incorporated the change about 4
+       # years later.
        AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[
                cf_save="$CPPFLAGS"
                CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE)
                AC_TRY_COMPILE([#include <sys/types.h>],[
                        #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2)
                                return 0;
+                       #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3)
+                               return 0;
                        #else
                        #       error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old
                        #endif],