From f14182f6e77217a9eb267dcae7d79908920629c7 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sat, 25 Sep 2010 04:01:56 +0700 Subject: maint: pass directory declarations in configure.ac into Makefile. * configure.ac (AC_CONFIG_AUX_DIR, LT_CONFIG_LTDL_DIR) (AC_CONFIG_MACRO_DIR): Append code to these functions to capture and propagate their directory arguments to Makefile. * Makefile.am (aux_dir, ltdl_dir, macro_dir): Remove declarations. * bootstrap (my_sed_trace): Also capture LT_CONFIG_LTDL_DIR into `$ltdl_dir'. : Output the extracted values of `aux_dir', `ltdl_dir' and `macro_dir' at the top of the quick'n'dirty bootstrap Makefile. --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index dd217fa9..ede0fc01 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,18 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE. AC_INIT([GNU Libtool], [2.4.3a], [bug-libtool@gnu.org]) m4_ifndef([AC_PACKAGE_URL], [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/libtool/])]) + +# Since we already declare these directories in this file, save those +# choices, and push the results into Makefile.am to avoid declaring +# them in two places making renames error prone, and where copies +# might get out of sync. +m4_define([AC_CONFIG_AUX_DIR], + m4_defn([AC_CONFIG_AUX_DIR])[AC_SUBST([aux_dir], ['${srcdir}/$1'])]) +m4_define([LT_CONFIG_LTDL_DIR], + m4_defn([LT_CONFIG_LTDL_DIR])[AC_SUBST([ltdl_dir], ['${srcdir}/$1'])]) +m4_define([AC_CONFIG_MACRO_DIR], + m4_defn([AC_CONFIG_MACRO_DIR])[AC_SUBST([macro_dir], ['${srcdir}/$1'])]) + AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([libtoolize.m4sh]) LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive]) -- cgit v1.2.1