From: Gary V. Vaughan Date: Fri, 24 Sep 2010 14:10:19 +0000 (+0700) Subject: maint: use aux_dir consistently in all files. X-Git-Tag: v2.4.2.418~330 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8570766c7dda766411fd89d6a187a325f351cd0a;p=thirdparty%2Flibtool.git maint: use aux_dir consistently in all files. * Makefile.am, Makefile.maint: Replace all uses of auxdir with aux_dir to match AC_CONFIG_AUX_DIR. * libltdl/config/libtoolize.m4sh: Likewise. * tests/defs.m4sh, tests/getopt-m4sh.at: Likewise. Signed-off-by: Gary V. Vaughan --- diff --git a/ChangeLog b/ChangeLog index 824d6145f..d53ace579 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2010-09-16 Gary V. Vaughan + + maint: use bootstrap script from gnulib. + * bootstrap: Replaced with gnulib script. + * bootstrap.conf: New file with Libtool specific bootstrap + configuration. + +2010-09-23 Gary V. Vaughan + + maint: use aux_dir consistently in all files. + * Makefile.am, Makefile.maint: Replace all uses of auxdir + with aux_dir to match AC_CONFIG_AUX_DIR. + * libltdl/config/libtoolize.m4sh: Likewise. + * tests/defs.m4sh, tests/getopt-m4sh.at: Likewise. + 2010-09-24 Gary V. Vaughan Makefile: try to be robust against shell meta-chars in filenames. diff --git a/Makefile.am b/Makefile.am index 3919359db..4e757d938 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,15 +43,15 @@ noinst_LTLIBRARIES = lib_LTLIBRARIES = EXTRA_LTLIBRARIES = -auxdir = libltdl/config +aux_dir = libltdl/config m4dir = libltdl/m4 -LT_M4SH = $(M4SH) -B '$(srcdir)/$(auxdir)' +LT_M4SH = $(M4SH) -B '$(srcdir)/$(aux_dir)' # Using `cd' in backquotes may print the directory name, use this instead: lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -MKSTAMP = '$(SHELL)' '$(srcdir)/$(auxdir)/mkstamp' +MKSTAMP = '$(SHELL)' '$(srcdir)/$(aux_dir)/mkstamp' timestamp = set dummy `$(MKSTAMP) '$(srcdir)'`; shift; \ case $(VERSION) in \ @@ -66,8 +66,8 @@ rebuild = rebuild=:; $(timestamp); revision=$$1 # Bootstrap. # # ---------- # -sh_files = $(auxdir)/general.m4sh $(auxdir)/getopt.m4sh -EXTRA_DIST += bootstrap $(auxdir)/mkstamp $(sh_files) \ +sh_files = $(aux_dir)/general.m4sh $(aux_dir)/getopt.m4sh +EXTRA_DIST += bootstrap $(aux_dir)/mkstamp $(sh_files) \ ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \ ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \ ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ @@ -84,8 +84,8 @@ CLEANFILES += libtool libtoolize configure_ac = $(srcdir)/configure.ac libtoolize_in = $(srcdir)/libtoolize.in libtoolize_m4sh = $(srcdir)/libtoolize.m4sh -ltmain_m4sh = $(srcdir)/$(auxdir)/ltmain.m4sh -ltmain_sh = $(srcdir)/$(auxdir)/ltmain.sh +ltmain_m4sh = $(srcdir)/$(aux_dir)/ltmain.m4sh +ltmain_sh = $(srcdir)/$(aux_dir)/ltmain.sh ltversion_in = $(srcdir)/$(m4dir)/ltversion.in ltversion_m4 = $(srcdir)/$(m4dir)/ltversion.m4 @@ -140,7 +140,7 @@ $(ltversion_m4): $(ltversion_in) $(configure_ac) ChangeLog ## would rerun configure on every invocation, so now we manually ## check the version numbers from the build rule when necessary. ## !WARNING! If you edit this rule to change the contents of ltmain.sh, -## you must `touch $(srcdir)/$(auxdir)/ltmain.m4sh' from the +## you must `touch $(srcdir)/$(aux_dir)/ltmain.m4sh' from the ## shell if you need ltmain.sh to be regenerated. Ideally, we ## should make this rule depend on Makefile but that will break ## distcheck (at least) by rebuilding ltmain.sh in the source @@ -235,7 +235,6 @@ bootstrap-deps-prep: $$exit_cmd 1 rm -f $(bootstrap_files) - ## Unfortunately, all this bogeyness means that we have to manually ## keep the generated files in libltdl up to date. LTDL_BOOTSTRAP_DEPS = \ @@ -458,7 +457,7 @@ install-data-local: $(lt_Makefile_in) ## Distribution. ## ## ------------- ## -edit_readme_alpha = $(srcdir)/$(auxdir)/edit-readme-alpha +edit_readme_alpha = $(srcdir)/$(aux_dir)/edit-readme-alpha EXTRA_DIST += $(edit_readme_alpha) @@ -955,7 +954,7 @@ tests/defs: $(defs_in) rm -f '$@' $(configure_edit) '$(defs_in)' > '$@' -$(defs_in): $(defs_m4sh) $(auxdir)/general.m4sh Makefile.am +$(defs_in): $(defs_m4sh) $(aux_dir)/general.m4sh Makefile.am rm -f '$@' $(LT_M4SH) '$(defs_m4sh)' > '$@' diff --git a/Makefile.maint b/Makefile.maint index e1767139d..675e7333b 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -88,11 +88,11 @@ WGET_CGIT = $(WGET) 'http://git.savannah.gnu.org/cgit/config.git/plain' ## FIXME should be a lot more here FETCHFILES = \ ./INSTALL \ -$(auxdir)/compile \ -$(auxdir)/install-sh \ -$(auxdir)/config.guess \ -$(auxdir)/config.sub \ -$(auxdir)/texinfo.tex +$(aux_dir)/compile \ +$(aux_dir)/install-sh \ +$(aux_dir)/config.guess \ +$(aux_dir)/config.sub \ +$(aux_dir)/texinfo.tex ## Fetch the latest versions of files we care about. .PHONY: fetch diff --git a/bootstrap b/bootstrap index e66b15176..753fc50be 100755 --- a/bootstrap +++ b/bootstrap @@ -64,11 +64,11 @@ test -f ./configure.ac || { } -# Extract auxdir and m4dir from configure.ac: +# Extract aux_dir and m4dir from configure.ac: lt_tab=' ' my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,; /AC_CONFIG_AUX_DIR[^_]/ { - s,^.*AC_CONFIG_AUX_DIR([[ '"$lt_tab"']*\([^])]*\).*$,auxdir=\1,; p; + s,^.*AC_CONFIG_AUX_DIR([[ '"$lt_tab"']*\([^])]*\).*$,aux_dir=\1,; p; }; /AC_CONFIG_MACRO_DIR/ { s,^.*AC_CONFIG_MACRO_DIR([[ '"$lt_tab"']*\([^])]*\).*$,m4dir=\1,; p; @@ -134,17 +134,17 @@ $MAKE bootstrap-deps \ rm -f Makefile # Make a dummy libtoolize script for autoreconf: -cat > $auxdir/libtoolize <<'EOF' +cat > $aux_dir/libtoolize <<'EOF' #! /bin/sh # This is a dummy file for bootstrapping libtool. echo "$0: Bootstrap detected, no files installed." | sed 's,^.*/,,g' exit 0 EOF -chmod 755 $auxdir/libtoolize +chmod 755 $aux_dir/libtoolize # Running the installed `libtoolize' will trash the local (newer) libtool.m4 # among others. Call the dummy script we made earlier. -LIBTOOLIZE=`pwd`/$auxdir/libtoolize +LIBTOOLIZE=`pwd`/$aux_dir/libtoolize export LIBTOOLIZE for sub in $reconfdirs; do @@ -160,7 +160,7 @@ done sleep 2 && touch libltdl/config-h.in # Remove our dummy libtoolize -rm -f $auxdir/libtoolize +rm -f $aux_dir/libtoolize # These files can cause an infinite configure loop if left behind. rm -f Makefile libltdl/Makefile libtool vcl.tmp @@ -168,7 +168,7 @@ rm -f Makefile libltdl/Makefile libtool vcl.tmp # This file is misgenerated earlier in bootstrap to satisfy automake 1.9.1 # and earlier, but has a new enough timestamp to not be updated. Force it # to be regenerated at make-time with proper substitutions in place: -touch $auxdir/ltmain.m4sh +touch $aux_dir/ltmain.m4sh for macro in LT_INIT AC_PROG_LIBTOOL AM_PROG_LIBTOOL; do if grep $macro aclocal.m4 libltdl/aclocal.m4; then diff --git a/libtoolize.m4sh b/libtoolize.m4sh index cd15c58af..50acbb412 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -406,7 +406,7 @@ func_scan_files () s,^.*m4@&t@_define(.*$,, s,^.*A[CU]_DEFUN(.*$,,; s,^.*m4@&t@_defun(.*$,, /AC_CONFIG_AUX_DIR(/ { - s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,ac_auxdir=\1, + s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,ac_aux_dir=\1, p } /AC_CONFIG_MACRO_DIR(/ { @@ -516,37 +516,37 @@ func_scan_files () ;; esac - # ---------------- # - # Validate auxdir. # - # ---------------- # + # ----------------- # + # Validate aux_dir. # + # ----------------- # - if test -n "$ac_auxdir"; then + if test -n "$ac_aux_dir"; then # If $configure_ac contains AC_CONFIG_AUX_DIR, check that it was # not given in terms of a shell variable! - case "$ac_auxdir" in + case "$ac_aux_dir" in *\$*) func_fatal_error "can not handle variables in AC_CONFIG_AUX_DIR" ;; *) - auxdir=$ac_auxdir + aux_dir=$ac_aux_dir ;; esac else - # Try to discover auxdir the same way it is discovered by configure. + # Try to discover aux_dir the same way it is discovered by configure. # Note that we default to the current directory. for dir in . .. ../..; do if test -f "$dir/install-sh"; then - auxdir=$dir + aux_dir=$dir break elif test -f "$dir/install.sh"; then - auxdir="$dir" + aux_dir="$dir" break fi done fi # Just use the current directory if all else fails. - test -n "$auxdir" || auxdir=. + test -n "$aux_dir" || aux_dir=. # ------------------------------ # @@ -1224,16 +1224,16 @@ func_install_pkgconfig_subproject () # Remove any lingering files that my have been installed by some # previous libtoolize release: $opt_force && for file in $all_pkgconfig_files; do - test -f "$subproject_auxdir/$file" && func_verbose "rm -f '$subproject_auxdir/$file'" - rm -f "$subproject_auxdir/$file" + test -f "$subproject_aux_dir/$file" && func_verbose "rm -f '$subproject_aux_dir/$file'" + rm -f "$subproject_aux_dir/$file" done # Copy all the files from installed libltdl to this project, if the - # user specified an auxdir. - $opt_quiet || if test "x$ac_auxdir" = "x$subproject_auxdir"; then - pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR, \`$subproject_auxdir'." - elif test -n "$auxdir"; then - pkgconfig_header="putting auxiliary files in \`$auxdir'." + # user specified an aux_dir. + $opt_quiet || if test "x$ac_aux_dir" = "x$subproject_aux_dir"; then + pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR, \`$subproject_aux_dir'." + elif test -n "$aux_dir"; then + pkgconfig_header="putting auxiliary files in \`$aux_dir'." fi func_copy_some_files "$pkgconfig_files" \ @@ -1252,26 +1252,26 @@ func_install_pkgconfig_parent () # Remove any lingering files that my have been installed by some # previous libtoolize release: $opt_force && for file in $all_pkgconfig_files; do - test -f "$auxdir/$file" && func_verbose "rm -f '$auxdir/$file'" - rm -f "$auxdir/$file" + test -f "$aux_dir/$file" && func_verbose "rm -f '$aux_dir/$file'" + rm -f "$aux_dir/$file" done - if test -n "$ac_auxdir"; then - pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR, \`$ac_auxdir'." - elif test -n "$auxdir" || test "x$ltdldir" = "x."; then - pkgconfig_header="putting auxiliary files in \`$auxdir'." + if test -n "$ac_aux_dir"; then + pkgconfig_header="putting auxiliary files in AC_CONFIG_AUX_DIR, \`$ac_aux_dir'." + elif test -n "$aux_dir" || test "x$ltdldir" = "x."; then + pkgconfig_header="putting auxiliary files in \`$aux_dir'." fi if $opt_install; then func_config_update config.guess \ - "$pkgdatadir/config" "$auxdir" pkgconfig_header + "$pkgdatadir/config" "$aux_dir" pkgconfig_header func_config_update config.sub \ - "$pkgdatadir/config" "$auxdir" pkgconfig_header + "$pkgdatadir/config" "$aux_dir" pkgconfig_header func_install_update install-sh \ - "$pkgdatadir/config" "$auxdir" pkgconfig_header + "$pkgdatadir/config" "$aux_dir" pkgconfig_header fi func_ltmain_update ltmain.sh \ - "$pkgdatadir/config" "$auxdir" pkgconfig_header + "$pkgdatadir/config" "$aux_dir" pkgconfig_header } @@ -1284,15 +1284,15 @@ func_install_pkgconfig_files () $opt_debug func_massage_pkgconfig_files - # 1. Parent shares auxdir with subproject ltdl: + # 1. Parent shares aux_dir with subproject ltdl: if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" && - test "x$ac_auxdir" = "x$subproject_auxdir" + test "x$ac_aux_dir" = "x$subproject_aux_dir" then func_install_pkgconfig_subproject - # 2. Parent has separate auxdir to subproject ltdl: + # 2. Parent has separate aux_dir to subproject ltdl: elif $opt_ltdl && test "x$ltdl_mode" = "xsubproject" - # && test "x$auxdir" != "x$subproject_auxdir" is implied + # && test "x$aux_dir" != "x$subproject_aux_dir" is implied then if $seen_autoconf; then func_install_pkgconfig_parent @@ -1300,7 +1300,7 @@ func_install_pkgconfig_files () func_install_pkgconfig_subproject # 3. Not subproject, but AC_CONFIG_AUX_DIR was used in parent: - elif test -n "$ac_auxdir" || test "x$auxdir" = "x."; then + elif test -n "$ac_aux_dir" || test "x$aux_dir" = "x."; then func_install_pkgconfig_parent # 4. AC_CONFIG_AUX_DIR was not specified: @@ -1397,8 +1397,8 @@ func_check_macros () # For subproject mode, offer some suggestions for avoiding duplicate # files in a project that uses libltdl: if test "x$ltdl_mode" = "xsubproject"; then - test "$subproject_auxdir" = "$auxdir" || - func_echo "Consider using \`AC_CONFIG_AUX_DIR([$subproject_auxdir])' in $configure_ac." + test "$subproject_aux_dir" = "$aux_dir" || + func_echo "Consider using \`AC_CONFIG_AUX_DIR([$subproject_aux_dir])' in $configure_ac." $ac_config_macro_dir_advised || test "$subproject_macrodir" = "$macrodir" || func_echo "Consider using \`AC_CONFIG_MACRO_DIR([$subproject_macrodir])' in $configure_ac." ac_config_macro_dir_advised=: @@ -1457,7 +1457,7 @@ func_check_macros () pkgdatadir=@pkgdatadir@ pkgltdldir=@pkgdatadir@ aclocaldir=@aclocaldir@ - auxdir= + aux_dir= macrodir= configure_ac=configure.in @@ -1494,7 +1494,7 @@ func_check_macros () .) ltdlprefix= ;; *) ltdlprefix=$ltdldir/ ;; esac - subproject_auxdir=${ltdlprefix}config + subproject_aux_dir=${ltdlprefix}config subproject_macrodir=${ltdlprefix}m4 # :::BE CAREFUL HERE::: diff --git a/tests/defs.m4sh b/tests/defs.m4sh index b56426ff2..59101d9f3 100644 --- a/tests/defs.m4sh +++ b/tests/defs.m4sh @@ -343,8 +343,8 @@ func_exec () prefix=./_inst-`echo "$0" | sed 's,.*/,,; s,-.*,,'` srcdir=`cd $srcdir && pwd` m4dir=$srcdir/libltdl/m4 -auxdir=$srcdir/libltdl/config -scripts="$auxdir/ltmain.m4sh $srcdir/libtoolize.m4sh" +aux_dir=$srcdir/libltdl/config +scripts="$aux_dir/ltmain.m4sh $srcdir/libtoolize.m4sh" # Unset some MAKE... variables that may cause $MAKE to act like a # recursively invoked sub-make. Any $MAKE invocation in a test is diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at index 75a7bf6d3..7c6f97267 100644 --- a/tests/getopt-m4sh.at +++ b/tests/getopt-m4sh.at @@ -24,7 +24,7 @@ AT_BANNER([Shell option parser generator.]) -auxdir="$abs_top_srcdir/libltdl/config" +aux_dir="$abs_top_srcdir/libltdl/config" # _LT_AT_GETOPT_M4SH_SETUP