From: Jim Meyering <meyering@redhat.com>
Date: Sun, 5 Oct 2008 15:49:55 +0000 (+0200)
Subject: bootstrap: check for LT_INIT more portably
X-Git-Tag: v0.1~6892
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=785dc8ba76a688c5746d230dc5b7d4102d42ab4c;p=gnulib.git

bootstrap: check for LT_INIT more portably

* build-aux/bootstrap: Avoid using grep -E, since it's not
portable enough.  Suggestion from Bruno Haible.
---

diff --git a/ChangeLog b/ChangeLog
index 9094a520a..bbc3db52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-05  Jim Meyering  <meyering@redhat.com>
+
+	bootstrap: check for LT_INIT more portably
+	* build-aux/bootstrap: Avoid using grep -E, since it's not
+	portable enough.  Suggestion from Bruno Haible.
+
 2008-10-05  Bruno Haible  <bruno@clisp.org>
 
 	* doc/posix-headers/sys_select.texi: Mention 'struct timeval' problem
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 74573efaa..1ad154f39 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -597,8 +597,16 @@ for command in \
   'automake --add-missing --copy --force-missing';
 do
   if test "$command" = libtool; then
-    grep -E '^[	 ]*(LT_INIT|A[CM]_PROG_LIBTOOL)\>' configure.ac >/dev/null ||
-      continue
+    use_libtool=0
+    # We'd like to use grep -E, to see if any of LT_INIT,
+    # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+    # but that's not portable enough (e.g., for Solaris).
+    grep '^[	 ]*A[CM]_PROG_LIBTOOL\>' configure.ac >/dev/null \
+      && use_libtool=1
+    grep '^[	 ]*LT_INIT\>' configure.ac >/dev/null \
+      && use_libtool=1
+    test $use_libtool = 0 \
+      && continue
     command='libtoolize -c -f'
   fi
   echo "$0: $command ..."