From: Christian Weisgerber <naddy@mips.inka.de>
Date: Thu, 1 Jul 2010 09:08:34 +0000 (+0200)
Subject: gettext: Use AC_GNU_SOURCE as a fallback for AC_USE_SYSTEM_EXTENSIONS.
X-Git-Tag: stable/20100704~4
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=cbec1d8225374eb1ceca7b8b4cb5ab8e42a87900;p=gnulib.git

gettext: Use AC_GNU_SOURCE as a fallback for AC_USE_SYSTEM_EXTENSIONS.
(cherry picked from commit 6e9c6242fbc14dea9d90aece11704c527b4eea60)
---

diff --git a/ChangeLog b/ChangeLog
index 0694d463b..af900b1e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-01  Christian Weisgerber  <naddy@mips.inka.de>  (tiny change)
+
+	gettext: Use AC_GNU_SOURCE as a fallback for AC_USE_SYSTEM_EXTENSIONS.
+	* m4/fcntl-o.m4 (gl_FCNTL_O_FLAGS): When AC_USE_SYSTEM_EXTENSIONS is
+	not present (i.e. with autoconf 2.59 and when using gettextize, not
+	gnulib), require AC_GNU_SOURCE instead.
+
 2010-07-01  Ian Beckwith  <ianb@erislabs.net>
 
 	idpriv-drop: Fix tests.
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
index d416a61c8..1adacc8ab 100644
--- a/m4/fcntl-o.m4
+++ b/m4/fcntl-o.m4
@@ -1,4 +1,4 @@
-# fcntl-o.m4 serial 1
+# fcntl-o.m4 serial 2
 dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,11 @@ dnl Written by Paul Eggert.
 AC_DEFUN([gl_FCNTL_O_FLAGS],
 [
   dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
   AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(