[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: glob on glibc systems
|
From: |
Bruno Haible |
|
Subject: |
Re: glob on glibc systems |
|
Date: |
Wed, 14 Mar 2018 23:10:27 +0100 |
|
User-agent: |
KMail/5.1.3 (Linux/4.4.0-112-generic; KDE/5.18.0; x86_64; ; ) |
Details on this one:
> > glob.o
>
> Replacement required because of
> checking for GNU glob interface version 1... no
This is because /usr/include/gnu-versions.h now defines
_GNU_GLOB_INTERFACE_VERSION to 2, following this commit in glibc:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ccf970c7a77e86f4f5ef8ecc5e637114b1c0136a
Adhemerval, does this patch look right? Is gnulib's glob compatible with
_GNU_GLOB_INTERFACE_VERSION == 2?
diff --git a/m4/glob.m4 b/m4/glob.m4
index 9dedb41..6128361 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,4 +1,4 @@
-# glob.m4 serial 16
+# glob.m4 serial 17
dnl Copyright (C) 2005-2007, 2009-2018 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,14 +14,14 @@ AC_DEFUN([gl_GLOB],
if test -z "$GLOB_H"; then
AC_CACHE_CHECK([for GNU glob interface version 1],
- [gl_cv_gnu_glob_interface_version_1],
+ [gl_cv_gnu_glob_interface_version_1_2],
[ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[[#include <gnu-versions.h>
-char a[_GNU_GLOB_INTERFACE_VERSION == 1 ? 1 : -1];]])],
- [gl_cv_gnu_glob_interface_version_1=yes],
- [gl_cv_gnu_glob_interface_version_1=no])])
+char a[_GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 ?
1 : -1];]])],
+ [gl_cv_gnu_glob_interface_version_1_2=yes],
+ [gl_cv_gnu_glob_interface_version_1_2=no])])
- if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
+ if test "$gl_cv_gnu_glob_interface_version_1_2" = "no"; then
GLOB_H=glob.h
fi
fi