From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 14 Nov 2011 04:54:22 +0000 (+0700)
Subject: libtoolize: aux scripts go in ltdl dir when parent has no configure.
X-Git-Tag: v2.4.2.418~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd1292f5bcd4bf2fbcb637e4cdb2338d2db56a63;p=thirdparty%2Flibtool.git

libtoolize: aux scripts go in ltdl dir when parent has no configure.

When using libtoolize to install subproject libltdl into a
parent project that does not use autotools, set the default
directory for auxiliary scripts inside libltdl rather than
littering the parent project with files it doesn't use.
* libtoolize.m4sh (func_require_ac_aux_dir): In verbose mode,
report results like other require_ funcs.
(func_require_aux_dir): Put subproject auxiliary files into ltdl
directory where libltdl/configure will be able to find
`install-sh' and others.

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

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 3e663c37a..9a2726e4c 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1365,7 +1365,7 @@ func_require_ac_aux_dir ()
 
     $require_configure_ac
 
-    if test -n "$configure_ac"; then
+    test -n "$configure_ac" && {
       func_extract_trace AC_CONFIG_AUX_DIR
       ac_aux_dir=$func_extract_trace_result
 
@@ -1375,7 +1375,9 @@ func_require_ac_aux_dir ()
 can not expand unknown variable in AC_CONFIG_AUX_DIR argument."
           ;;
       esac
-    fi
+    }
+
+    test -n "$ac_aux_dir" && func_verbose "ac_aux_dir='$ac_aux_dir'"
 
     require_ac_aux_dir=:
 }
@@ -1515,8 +1517,22 @@ func_require_aux_dir ()
 
     $require_ac_aux_dir
 
-    test -n "$aux_dir" || aux_dir=$ac_aux_dir
-    test -n "$aux_dir" || {
+    test -z "$aux_dir" && aux_dir=$ac_aux_dir
+
+    # Subproject ltdl without $configure_ac keeps pkgauxfiles in
+    # specified --ltdl optarg directory.
+    test -z "$aux_dir" && $opt_ltdl && {
+      $require_configure_ac
+
+      test -n "$configure_ac" || {
+        $require_ltdl_dir
+        $require_ltdl_mode
+
+        test subproject = "$ltdl_mode" && aux_dir="$ltdl_dir"
+      }
+    }
+
+    test -z "$aux_dir" && {
       # Try to intuit aux_dir using the same heuristic as Autoconf.
       for _G_dir in . .. ../..; do
         if test -f "$_G_dir/install-sh" || test -f "$_G_dir/install.sh"
@@ -1528,7 +1544,7 @@ func_require_aux_dir ()
     }
 
     # Use the current directory if all else fails.
-    test -n "$aux_dir" || aux_dir=.
+    test -z "$aux_dir" && aux_dir=.
 
     require_aux_dir=:
 }