From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 19 Oct 2012 09:21:27 +0000 (+0700)
Subject: libtoolize: select the first directory from AC_CONFIG_MACRO_DIRS.
X-Git-Tag: v2.4.2.418~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fad11c77779e66e1c33cfb0617312ba23369a285;p=thirdparty%2Flibtool.git

libtoolize: select the first directory from AC_CONFIG_MACRO_DIRS.

* tests/libtoolize.at (multiple AC_CONFIG_MACRO_DIRS directories):
New test to ensure multiple directory arguments mork correctly.
* libtoolize.in (func_require_ac_macro_dir): Use expr to discard
any additional space delimited entries in the first
AC_CONFIG_MACRO_DIRS argument.
* bootstrap (func_require_macro_dir): Likewise.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/bootstrap b/bootstrap
index 671a54546..29fa4386b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1484,8 +1484,10 @@ func_require_macro_dir ()
 
     # Sometimes this is stored in `configure.ac'.
     test -n "$macro_dir" || {
+      # AC_CONFIG_MACRO_DIRS takes a space delimited list of directories,
+      # but we only care about the first one in bootstrap.
       func_extract_trace_first AC_CONFIG_MACRO_DIRS
-      macro_dir=$func_extract_trace_first_result
+      macro_dir=`expr "x$func_extract_trace_first_result" : 'x\([^	 ]*\)'`
     }
     test -n "$macro_dir" || {
       func_extract_trace_first AC_CONFIG_MACRO_DIR
diff --git a/libtoolize.in b/libtoolize.in
index d58182017..612c37f4f 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -1525,7 +1525,7 @@ func_require_ac_macro_dir ()
 
     if test -n "$configure_ac"; then
       func_extract_trace_first AC_CONFIG_MACRO_DIRS
-      ac_macro_dir=$func_extract_trace_first_result
+      ac_macro_dir=`expr "x$func_extract_trace_first_result" : 'x\([^	 ]*\)'`
 
       test -n "$ac_macro_dir" || {
         func_extract_trace_first AC_CONFIG_MACRO_DIR
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 28bf04b3a..0e743b0bd 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -155,6 +155,34 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
 AT_CLEANUP
 
 
+AT_SETUP([multiple AC_CONFIG_MACRO_DIRS directories])
+
+AT_DATA([configure.ac],
+[[AC_INIT([libtooize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIRS([first second third])
+LT_INIT
+AC_OUTPUT
+]])
+
+AT_DATA(expout,
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, `first'.
+libtoolize: copying file `first/libtool.m4'
+libtoolize: copying file `first/ltoptions.m4'
+libtoolize: copying file `first/ltsugar.m4'
+libtoolize: copying file `first/ltversion.m4'
+libtoolize: copying file `first/lt~obsolete.m4'
+libtoolize: Consider adding `-I first' to ACLOCAL_AMFLAGS in Makefile.am.
+]])
+
+LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)
+
+AT_CLEANUP
+
+
+
 ## ------------------------------------ ##
 ## ACLOCAL_AMFLAGS macrodir extraction. ##
 ## ------------------------------------ ##