From: Jim Meyering <jim@meyering.net>
Date: Mon, 12 Mar 2007 08:47:36 +0000 (+0100)
Subject: Make bootstrap.conf a tiny bit more generic.
X-Git-Tag: COREUTILS-6_9~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e7a0f088b2704dab15c8b513773f7014fdf64ed;p=thirdparty%2Fcoreutils.git

Make bootstrap.conf a tiny bit more generic.
* bootstrap.conf (XGETTEXT_OPTIONS): Exclude gettext-related .m4
files when e.g., AM_GNU_GETTEXT([external] appears in configure.ac.
---

diff --git a/ChangeLog b/ChangeLog
index ad29325a88..267c5662c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-12  Jim Meyering  <jim@meyering.net>
+
+	Make bootstrap.conf a tiny bit more generic.
+	* bootstrap.conf (XGETTEXT_OPTIONS): Exclude gettext-related .m4
+	files when e.g., AM_GNU_GETTEXT([external] appears in configure.ac.
+
 2007-03-10  Jim Meyering  <jim@meyering.net>
 
 	Try to fix today's NFS-related failure: Treat ESTALE like EACCES.
diff --git a/bootstrap.conf b/bootstrap.conf
index 6709afd046..30433216d2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -81,17 +81,32 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=wrapf:1:c-format\\\
 '
 
-# Gettext supplies these files, but we don't need them since
-# we don't have an intl subdirectory.
-excluded_files='
-    m4/glibc2.m4
-    m4/intdiv0.m4
-    m4/lcmessage.m4
-    m4/lock.m4
-    m4/printf-posix.m4
-    m4/size_max.m4
-    m4/uintmax_t.m4
-    m4/ulonglong.m4
-    m4/visibility.m4
-    m4/xsize.m4
-'
+# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+# appears in configure.ac, exclude some unnecessary files.
+# Without grep's -E option (not portable enough, pre-configure),
+# the following test is ugly.  Also, this depends on the existence
+# of configure.ac, not the obsolescent-named configure.in.  But if
+# you're using this infrastructure, you should care about such things.
+
+gettext_external=0
+grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+  gettext_external=1
+grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+  gettext_external=1
+
+if test $gettext_external = 1; then
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  excluded_files='
+      m4/glibc2.m4
+      m4/intdiv0.m4
+      m4/lcmessage.m4
+      m4/lock.m4
+      m4/printf-posix.m4
+      m4/size_max.m4
+      m4/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+      m4/xsize.m4
+  '
+fi