From e86c48893fdd952286c530568860bd9acdf4be00 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 5 Aug 2013 11:24:26 -0700 Subject: [PATCH] regex: port to non-glibc/lock-using systems Since 29-05-2013 commit, 55ba71f4, compilation on a non-glibc system with GNULIB_LOCK would fail due to absence of the included "glthread/lock.h". This would affect any package for which the "lock" module is used only by the regex module, and not explicitly used. * m4/regex.m4 (gl_PREREQ_REGEX): Require gl_GLIBC21. * modules/regex (Depends-on) [!GLIBC && $ac_use_included_regex]: Add a dependency on the "lock" module. --- ChangeLog | 12 ++++++++++++ m4/regex.m4 | 1 + modules/regex | 1 + 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9abfb4c..b0f798d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-08-05 Jim Meyering + + regex: port to non-glibc/lock-using systems + Since 29-05-2013 commit, 55ba71f4, compilation on a non-glibc + system with GNULIB_LOCK would fail due to absence of the + included "glthread/lock.h". This would affect any package + for which the "lock" module is used only by the regex module, + and not explicitly used. + * m4/regex.m4 (gl_PREREQ_REGEX): Require gl_GLIBC21. + * modules/regex (Depends-on) [!GLIBC && $ac_use_included_regex]: + Add a dependency on the "lock" module. + 2013-07-20 Daiki Ueno localecharset: make locale_charset thread-safe on Mac OS X diff --git a/m4/regex.m4 b/m4/regex.m4 index 6d29dcf..0945c11 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -266,6 +266,7 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_REQUIRE([gl_EEMALLOC]) + AC_REQUIRE([gl_GLIBC21]) AC_CHECK_HEADERS([libintl.h]) AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll]) AC_CHECK_DECLS([isblank], [], [], [[#include ]]) diff --git a/modules/regex b/modules/regex index 8f5eda0..9d2e4d2 100644 --- a/modules/regex +++ b/modules/regex @@ -18,6 +18,7 @@ ssize_t alloca-opt [test $ac_use_included_regex = yes] btowc [test $ac_use_included_regex = yes] gettext-h [test $ac_use_included_regex = yes] +lock [test "$ac_cv_gnu_library_2_1:$ac_use_included_regex" = no:yes] malloc-gnu [test $ac_use_included_regex = yes] memcmp [test $ac_use_included_regex = yes] memmove [test $ac_use_included_regex = yes] -- 1.8.4.rc0.11.g35f5eaa