changeset 10590:666da211ee85

bootstrap: check for LT_INIT more portably * build-aux/bootstrap: Avoid using grep -E, since it's not portable enough. Suggestion from Bruno Haible.
author Jim Meyering <meyering@redhat.com>
date Sun, 05 Oct 2008 17:49:55 +0200
parents 5fb4d66b24aa
children 9a7657d2031f
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -597,8 +597,16 @@
   '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 ..."