From fad11c77779e66e1c33cfb0617312ba23369a285 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 19 Oct 2012 16:21:27 +0700 Subject: 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 --- tests/libtoolize.at | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'tests') diff --git a/tests/libtoolize.at b/tests/libtoolize.at index 28bf04b3..0e743b0b 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. ## ## ------------------------------------ ## -- cgit v1.2.1