From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 3 Jan 2014 03:01:53 +0000 (+1300)
Subject: configury: use bootstrap ChangeLog management feature.
X-Git-Tag: v2.4.3~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4357284ea9899cb50176b75baaeba9ee74687efa;p=thirdparty%2Flibtool.git

configury: use bootstrap ChangeLog management feature.

* gl/build-aux/bootstrap.in (func_autoreconf): Accept an optional
directory argument to pass to $AUTORECONF.
Update doc-comment.
* bootstrap.conf (func_reconfigure): Remove. Don't completely
overwrite bootstrap's func_reconfigure, shadowing auto-ChangeLog
management.
(func_autopoint, func_libtoolize): Overwrite these un-needed
calls instead.
(libtool_autoreconf_libltdl): New hook function to run second
autoreconf in libltdl directory.
(libtool_force_changelog): Remove.  This is all handled by
bootstrap's func_reconfigure again.
* bootstrap: Regenerate.

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

diff --git a/bootstrap b/bootstrap
index 2fbd533b8..c3edaf1bc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3016,12 +3016,21 @@ EOT
 }
 
 
-# func_autoreconf
-# ---------------
+# func_autoreconf [SUBDIR]
+# ------------------------
 # Being careful not to re-run 'autopoint' or 'libtoolize', and not to
 # try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
 # don't use them, defer to 'autoreconf' for execution of the remaining
 # autotools to bootstrap this package.
+#
+# Projects with multiple trees to reconfigure can hook another call to
+# this function onto func_reconfigure:
+#
+#    my_autoreconf_foo ()
+#    {
+#        func_autoreconf foo
+#    }
+#    func_add_hook func_reconfigure my_autoreconf_foo
 func_autoreconf ()
 {
     $debug_cmd
@@ -3038,7 +3047,7 @@ func_autoreconf ()
     $opt_copy || func_append _G_autoreconf_options " --symlink"
     $opt_force && func_append _G_autoreconf_options " --force"
     $opt_verbose && func_append _G_autoreconf_options " --verbose"
-    func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?'
+    func_show_eval "$AUTORECONF$_G_autoreconf_options --install${1+ $1}" 'exit $?'
 
     AUTOPOINT=$save_AUTOPOINT
     LIBTOOLIZE=$save_LIBTOOLIZE
diff --git a/bootstrap.conf b/bootstrap.conf
index 6365ca6ea..c8614cbd7 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -109,37 +109,21 @@ libtool_obsolete_files="
 ## Override functions. ##
 ## ------------------- ##
 
-# func_reconfigure
-# ------------------
-# In addition to needing to autoreconf two directories, Libtool provides
-# 'libtoolize' and doesn't use 'autopoint', so we can use a somewhat
-# simpler 'func_reconfigure' implementation than bootstrap's version.
-func_reconfigure ()
+# func_autopoint
+# --------------
+# Libtool does not use autopoint.
+func_autopoint ()
 {
     $debug_cmd
+}
 
-    $require_autoheader
-    $require_build_aux
-    $require_ltdl_dir
-    $require_macro_dir
-
-    # Only need this from the top level directory
-    func_gnulib_tool
-
-    export LIBTOOLIZE
-    func_verbose "export LIBTOOLIZE='$LIBTOOLIZE'"
-
-    my_autoreconf_options=
-    $opt_copy || func_append my_autoreconf_options " --symlink"
-    $opt_force && func_append my_autoreconf_options " --force"
-    $opt_verbose && func_append my_autoreconf_options " --verbose"
-
-    func_show_eval "$AUTORECONF$my_autoreconf_options --install ." \
-      'exit $?'
 
-    # Also bootstrap libltdl ready for installation.
-    func_show_eval "$AUTORECONF$my_autoreconf_options --install $ltdl_dir" \
-      'exit $?'
+# func_libtoolize
+# ---------------
+# Libtoolize is part of Libtool!
+func_libtoolize ()
+{
+    $debug_cmd
 }
 
 
@@ -231,16 +215,17 @@ libtool_build_prerequisites ()
 func_add_hook func_gnulib_tool libtool_build_prerequisites
 
 
-# libtool_force_changelog
-# -----------------------
-# Automake requires that ChangeLog exist.
-libtool_force_changelog ()
+# libtool_autoreconf_libltdl
+# --------------------------
+# Libtldl directory needs to be autoreconfed too.
+libtool_autoreconf_libltdl ()
 {
     $debug_cmd
 
-    echo "Autogenerated by 'make dist'" > ChangeLog || exit 1
+    # Also bootstrap libltdl ready for installation.
+    func_autoreconf libltdl
 }
-func_add_hook func_gnulib_tool libtool_force_changelog
+func_add_hook func_reconfigure libtool_autoreconf_libltdl
 
 
 # libtool_readme_release_package_substitutions
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 8d1b9cef2..93f1c25d8 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -682,12 +682,21 @@ EOT
 }
 
 
-# func_autoreconf
-# ---------------
+# func_autoreconf [SUBDIR]
+# ------------------------
 # Being careful not to re-run 'autopoint' or 'libtoolize', and not to
 # try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
 # don't use them, defer to 'autoreconf' for execution of the remaining
 # autotools to bootstrap this package.
+#
+# Projects with multiple trees to reconfigure can hook another call to
+# this function onto func_reconfigure:
+#
+#    my_autoreconf_foo ()
+#    {
+#        func_autoreconf foo
+#    }
+#    func_add_hook func_reconfigure my_autoreconf_foo
 func_autoreconf ()
 {
     $debug_cmd
@@ -704,7 +713,7 @@ func_autoreconf ()
     $opt_copy || func_append _G_autoreconf_options " --symlink"
     $opt_force && func_append _G_autoreconf_options " --force"
     $opt_verbose && func_append _G_autoreconf_options " --verbose"
-    func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?'
+    func_show_eval "$AUTORECONF$_G_autoreconf_options --install${1+ $1}" 'exit $?'
 
     AUTOPOINT=$save_AUTOPOINT
     LIBTOOLIZE=$save_LIBTOOLIZE