From: Bruno Haible Date: Wed, 28 Jun 2006 11:57:34 +0000 (+0000) Subject: Ensure automatic ordering between gl_LOCK and gl_ARGP. X-Git-Tag: v0.15~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f161725feeea2bb18e943e5cf8a0dcda2b436f7f;p=thirdparty%2Fgettext.git Ensure automatic ordering between gl_LOCK and gl_ARGP. --- diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 58e761407..70034079e 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-01-08 Bruno Haible + + Ensure automatic ordering between gl_LOCK and gl_ARGP. + * lock.m4 (gl_LOCK_BODY): Renamed from gl_LOCK. + (gl_LOCK): New macro, requiring gl_LOCK_BODY. + 2006-06-23 Bruno Haible * gettext.m4 (gt_INTL_SUBDIR_CORE): Check for argz_* functions, diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4 index 0aff3fada..d1ea1ca83 100644 --- a/gettext-runtime/m4/lock.m4 +++ b/gettext-runtime/m4/lock.m4 @@ -1,4 +1,4 @@ -# lock.m4 serial 1 (gettext-0.15) +# lock.m4 serial 2 (gettext-0.15) dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,6 +20,13 @@ dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for dnl multithread-safe programs. AC_DEFUN([gl_LOCK], +[ + AC_REQUIRE([gl_LOCK_BODY]) +]) + +dnl The guts of gl_LOCK. Needs to be expanded only once. + +AC_DEFUN([gl_LOCK_BODY], [ dnl Ordering constraints: This macro modifies CPPFLAGS in a way that dnl influences the result of the autoconf tests that test for *_unlocked