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 9094a520a423ef7ad1e5455c30087119db8feccc..bbc3db52ac1a98c63810f028200bf14f8a3bfdae 100644 (file)
--- 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 74573efaa60a23d82ca920fd6b3b8e711e30e2d7..1ad154f39113ec347adbab80b3fb465151dfa49a 100755 (executable)
--- 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 ..."