Applied to HEAD.
Index: ChangeLog
from Gary V. Vaughan <[EMAIL PROTECTED]>
There are 5 distinct batches of files that libtoolize might
install into a project, depending on whether libltdl is
being installed in subproject mode, and in that case whether
the parent project shares the config and macro directories
with the subproject ltdl. Make a separate function for each
of those 5 batches (4 new functions below, plus the recently
factored func_install_pkgltdl_files), and make a clearer
distinction between when each of them is needed:
* libtoolize.m4sh (func_install_pkgmacro_subproject):
New function for installing and reporting on m4 files copied
to a subproject ltdl directory.
(func_install_pkgmacro_parent): Similar new function for m4
files copied solely for the use of the parent project,
including serial checking.
(func_install_pkgconfig_subproject): New function for
installing and reporting on config helper files copied to a
subproject ltdl directory.
(func_install_pkgconfig_parent): Similar new function for
config helper files copied solely for the use of the parent
project, including serial checking.
(func_install_pkgmacro_files, func_install_pkgconfig_files):
Rewritten in terms of the above functions.
* tests/libtoolize.at: Adjust test expout's to match newly
regularized libtoolize output.
Move parent project pkgconfig files to build-aux directory
so that progress messages show an obvious difference to
pkgconfig files installed to subproject `config' directory.
(nonrecursive ltdl with AC_CONFIG_MACRO_DIR): New test.
(diagnose missing LT_CONFIG_LTDL_DIR): New test.
(subproject ltdl with non-shared directories): New test.
Reported by Eric Blake <[EMAIL PROTECTED]>
Index: libtoolize.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.73
diff -u -u -r1.73 libtoolize.m4sh
--- libtoolize.m4sh 28 Jan 2008 07:34:25 -0000 1.73
+++ libtoolize.m4sh 31 Jan 2008 16:13:10 -0000
@@ -937,6 +937,100 @@
}
+# func_install_pkgmacro_subproject
+# Unless --quiet was passed, display a message. Then copy pkgmacro_files
+# from libtool installation tree to subproject libltdl tree.
+func_install_pkgmacro_subproject ()
+{
+ $opt_debug
+
+ # Copy all the files from installed libltdl to this project, if the
+ # user specified a macrodir.
+ $opt_quiet || if test "x$macrodir" != "x$subproject_macrodir"; then
+ func_echo "putting macros in \`$subproject_macrodir'."
+ elif test -n "$subproject_macrodir"; then
+ func_echo "putting macros in AC_CONFIG_MACRO_DIR,
\`$subproject_macrodir'."
+ fi
+
+ func_copy_some_files "argz.m4:libtool.m4:ltdl.m4:$pkgmacro_files" \
+ "$aclocaldir" "$subproject_macrodir"
+}
+
+
+# func_install_pkgmacro_parent
+# Unless --quiet was passed, or AC_CONFIG_MACRO_DIR was not seen, display
+# a message. Then update appropriate macros if newer ones are available
+# from the libtool installation tree.
+func_install_pkgmacro_parent ()
+{
+ $opt_debug
+
+ # Copy all the files from installed libltdl to this project, if the
+ # user specified a macrodir.
+ $opt_quiet || if test -n "$ac_macrodir"; then
+ func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$ac_macrodir'."
+ elif test -n "$macrodir"; then
+ func_echo "putting macros in \`$macrodir'."
+ fi
+
+ if $opt_ltdl; then
+ func_serial_update argz.m4 "$aclocaldir" "$macrodir" argz.m4
+ else
+ func_verbose "Not copying \`$macrodir/argz.m4', libltdl not used."
+ fi
+
+ func_serial_update libtool.m4 "$aclocaldir" "$macrodir" \
+ LT_INIT 'A[CM]_PROG_LIBTOOL'
+
+ if $opt_ltdl; then
+ func_serial_update ltdl.m4 "$aclocaldir" "$macrodir" 'LTDL_INIT'
+ else
+ func_verbose "Not copying \`$macrodir/ltdl.m4', libltdl not used."
+ fi
+
+ my_save_IFS="$IFS"
+ IFS=:
+ for file in $pkgmacro_files; do
+ IFS="$my_save_IFS"
+ func_serial_update $file "$aclocaldir" "$macrodir" "$file"
+ done
+ IFS="$my_save_IFS"
+}
+
+
+# func_install_pkgmacro_files
+# Install copies of the libtool and libltdl m4 macros into this package.
+func_install_pkgmacro_files ()
+{
+ $opt_debug
+
+ # argz.m4, libtool.m4 and ltdl.m4 are handled specially below:
+ func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
+
+ # 1. Parent has separate macrodir to subproject ltdl:
+ if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" &&
+ test -n "$macrodir" && test "x$macrodir" != "x$subproject_macrodir"
+ then
+ func_install_pkgmacro_parent
+ func_install_pkgmacro_subproject
+
+ # 2. Parent shares macrodir with subproject ltdl:
+ elif $opt_ltdl && test "x$ltdl_mode" = "xsubproject"
+ # && test "x$macrodir" = "x$subproject_macrodir"
+ then
+ func_install_pkgmacro_subproject
+
+ # 3. Not a subproject, but macrodir was specified in parent:
+ elif test -n "$macrodir"; then
+ func_install_pkgmacro_parent
+
+ # 4. AC_CONFIG_MACRO_DIR was not specified:
+ else
+ func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool
macros."
+ fi
+}
+
+
# func_massage_pkgltdl_files [glob_exclude]
# @pkgltdl_files\@ is substituted as per its value in Makefile.am; this
# function massages it into a suitable format for func_copy_some_files.
@@ -972,6 +1066,44 @@
}
+# func_install_pkgltdl_files
+# Install copies of the libltdl files into this package. Any auxiliary
+# or m4 macro files needed in the libltdl tree will also be copied by
+# func_install_pkgconfig_files and func_install_pkgmacro_files resp.
+func_install_pkgltdl_files ()
+{
+ $opt_debug
+ $opt_ltdl || return
+
+ # Copy all the files from installed libltdl to this project, if the
+ # user specified `--ltdl'.
+ $opt_quiet || if test -n "$ac_ltdldir"; then
+ func_echo "putting libltdl files in LT_CONFIG_LTDL_DIR,
\`$ac_ltdldir'."
+ elif test -n "$ltdldir"; then
+ func_echo "putting libltdl files in \`$ltdldir'."
+ fi
+
+ # These files are handled specially, depending on ltdl_mode:
+ if test "x$ltdl_mode" = "xsubproject"; then
+ func_massage_pkgltdl_files 'Makefile.inc'
+ else
+ func_massage_pkgltdl_files
'Makefile.am|Makefile.in*|aclocal.m4|config*'
+ fi
+
+ func_copy_some_files "$pkgltdl_files" "$pkgltdldir/libltdl" "$ltdldir"
+
+ # For recursive ltdl modes, copy a suitable Makefile.{am,inc}:
+ case $ltdl_mode in
+ recursive)
+ func_fixup_Makefile "Makefile.am" "$pkgltdldir/libltdl" "$ltdldir"
+ ;;
+ nonrecursive)
+ func_fixup_Makefile "Makefile.inc" "$pkgltdldir/libltdl" "$ltdldir"
+ ;;
+ esac
+}
+
+
# func_massage_pkgconfig_files [glob_exclude]
# @pkgconfig_files\@ is substituted as per its value in Makefile.am; this
# function massages it into a suitable format for func_copy_some_files.
@@ -1004,117 +1136,83 @@
}
-# func_install_pkgconfig_files
-# Install copies of the auxiliary files into this package.
-func_install_pkgconfig_files ()
+# func_install_pkgconfig_subproject
+# Unless --quiet was passed, display a message. Then copy pkgconfig_files
+# from libtool installation tree to subproject libltdl tree.
+func_install_pkgconfig_subproject ()
{
$opt_debug
- func_massage_pkgconfig_files
- # Unless we share CONFIG_AUX_DIR with the libltdl subproject, then
- # if they are newer, copy all the installed utility files to the
- # auxiliary directory if `--install' was passed, or else copy just
- # ltmain.sh.
- if test -n "$auxdir"; then
- if test "$subproject_auxdir" != "$auxdir"; then
- $opt_quiet || if test "$auxdir" != .; then
- func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
- fi
- if $opt_install; then
- func_config_update config.guess "$pkgdatadir/config" "$auxdir"
- func_config_update config.sub "$pkgdatadir/config" "$auxdir"
- func_install_update install-sh "$pkgdatadir/config" "$auxdir"
- fi
- func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
- fi
- else
- func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool
auxiliary files."
+ # 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
+ func_echo "putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$subproject_auxdir'."
+ elif test -n "$auxdir"; then
+ func_echo "putting auxiliary files in \`$auxdir'."
fi
+
+ func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
}
-# func_install_pkgmacro_files
-# Install copies of the libtool and libltdl m4 macros into this package.
-func_install_pkgmacro_files ()
+# func_install_pkgconfig_parent
+# Unless --quiet was passed, or AC_CONFIG_AUX_DIR was not seen, display a
+# message. Then update appropriate auxiliary files if newer ones are
+# available from the libtool installation tree.
+func_install_pkgconfig_parent ()
{
$opt_debug
- # argz.m4, libtool.m4 and ltdl.m4 were handled specially below:
- func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
-
- # Copy libtool's m4 macros to the macro directory, if they are newer
- # (keep these in alphabetical order to maintain sanity in testsuite):
- if test -n "$macrodir"; then
- $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR,
\`$macrodir'."
-
- if $opt_ltdl; then
- func_serial_update argz.m4 "$aclocaldir" "$macrodir" argz.m4
- else
- func_verbose "Not copying \`$macrodir/argz.m4', libltdl not used."
- fi
-
- func_serial_update libtool.m4 "$aclocaldir" "$macrodir" \
- LT_INIT 'A[CM]_PROG_LIBTOOL'
-
- if $opt_ltdl; then
- func_serial_update ltdl.m4 "$aclocaldir" "$macrodir" 'LTDL_INIT'
- else
- func_verbose "Not copying \`$macrodir/ltdl.m4', libltdl not used."
- fi
+ # Copy all the files from installed libltdl to this project, if the
+ # user specified an auxdir.
+ $opt_quiet || if test -n "$ac_auxdir"; then
+ func_echo "putting auxiliary files in AC_CONFIG_AUX_DIR,
\`$ac_auxdir'."
+ elif test -n "$auxdir" || test "x$ltdldir" = "x."; then
+ func_echo "putting auxiliary files in \`$auxdir'."
+ fi
- my_save_IFS="$IFS"
- IFS=:
- for file in $pkgmacro_files; do
- IFS="$my_save_IFS"
- func_serial_update $file "$aclocaldir" "$macrodir" "$file"
- done
- IFS="$my_save_IFS"
+ if $opt_install; then
+ func_config_update config.guess "$pkgdatadir/config" "$auxdir"
+ func_config_update config.sub "$pkgdatadir/config" "$auxdir"
+ func_install_update install-sh "$pkgdatadir/config" "$auxdir"
fi
+ func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
}
-# func_install_pkgltdl_files
-# Install copies of the libltdl files into this package.
-func_install_pkgltdl_files ()
+# func_install_pkgconfig_files
+# Install copies of the auxiliary files into this package according to
+# the whether libltdl is included as a subproject, and whether the parent
+# shares the AC_CONFIG_AUX_DIR setting.
+func_install_pkgconfig_files ()
{
$opt_debug
+ func_massage_pkgconfig_files
- # These files are handled specially, depending on ltdl_mode:
- case $ltdl_mode in
- *recursive)
-
glob_exclude_pkgltdl_files='Makefile.am|Makefile.in*|aclocal.m4|config*'
- ;;
- *)
- glob_exclude_pkgltdl_files='Makefile.inc'
- ;;
- esac
-
- func_massage_pkgltdl_files "$glob_exclude_pkgltdl_files"
-
- # Copy all the files from installed libltdl to this project, if the
- # user specified `--ltdl'.
- if $opt_ltdl; then
-
- # Unless we share CONFIG_MACRO_DIR with our parent project,
- # copy macros here.
- if test "$subproject_macrodir" != "$macrodir"; then
- func_copy_some_files "argz.m4:libtool.m4:ltdl.m4:$pkgmacro_files" \
- "$aclocaldir" "$subproject_macrodir"
- fi
-
- func_copy_some_files "$pkgltdl_files" "$pkgltdldir/libltdl" "$ltdldir"
-
- # For recursive ltdl modes, copy a suitable Makefile.{am,inc}:
- case $ltdl_mode in
- recursive) func_fixup_Makefile "Makefile.am"
"$pkgltdldir/libltdl" "$ltdldir" ;;
- nonrecursive) func_fixup_Makefile "Makefile.inc"
"$pkgltdldir/libltdl" "$ltdldir" ;;
- esac
+ # 1. Parent shares auxdir with subproject ltdl:
+ if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" &&
+ test "x$ac_auxdir" = "x$subproject_auxdir"
+ then
+ func_install_pkgconfig_subproject
+
+ # 2. Parent has separate auxdir to subproject ltdl:
+ elif $opt_ltdl && test "x$ltdl_mode" = "xsubproject"
+ # && test "x$auxdir" != "x$subproject_auxdir" is implied
+ then
+ func_install_pkgconfig_parent
+ 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
+ func_install_pkgconfig_parent
- # Copy config aux files into libltdl.
- func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
+ # 4. AC_CONFIG_AUX_DIR was not specified:
+ else
+ func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool
auxiliary files."
fi
}
+
# func_nonemptydir_p dirvar
# DIRVAR is the name of a variable to evaluate. Unless DIRVAR names
# a directory that exists and is non-empty abort with a diagnostic.
@@ -1161,15 +1259,14 @@
my_ac_config_macro_srcdir="$subproject_macrodir"
fi
+ my_needed="libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4
lt~obsolete.m4"
+ $opt_ltdl && my_needed="$my_needed argz.m4 ltdl.m4"
+
func_echo "You should add the contents of the following files to
\`aclocal.m4':"
- for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4
lt~obsolete.m4; do
+ for need in $my_needed; do
func_echo " \`$my_ac_config_macro_srcdir/$need'"
done
- if $opt_ltdl; then
- for need in argz.m4 ltdl.m4; do
- func_echo " \`$my_ac_config_macro_srcdir/$need'"
- done
- fi
+
if test "$my_ac_config_macro_srcdir" != "$aclocaldir"; then
func_echo "or else add
\`AC_CONFIG_MACRO_DIR([$subproject_macrodir])' to $configure_ac."
ac_config_macro_dir_advised=:
@@ -1193,12 +1290,14 @@
test -n "$ac_ltdldir" ||
func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([$ltdldir])' to
\`$configure_ac'."
- # Offer some suggestions for avoiding duplicate files in a project
- # that uses libltdl:
- test "$subproject_auxdir" = "$auxdir" ||
- func_echo "Consider using \`AC_CONFIG_AUX_DIR([$subproject_auxdir])'
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."
+ # 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."
+ $ac_config_macro_dir_advised || test "$subproject_macrodir" =
"$macrodir" ||
+ func_echo "Consider using
\`AC_CONFIG_MACRO_DIR([$subproject_macrodir])' in $configure_ac."
+ fi
fi
# Don't trace for this, we're just checking the user didn't invoke it
Index: tests/libtoolize.at
===================================================================
RCS file: /sources/libtool/libtool/tests/libtoolize.at,v
retrieving revision 1.14
diff -u -u -r1.14 libtoolize.at
--- tests/libtoolize.at 26 Jan 2008 06:23:10 -0000 1.14
+++ tests/libtoolize.at 31 Jan 2008 16:13:15 -0000
@@ -30,7 +30,7 @@
m4_define([_LT_CONFIGURE_AC],
[AT_DATA([configure.ac],
[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
LT_INIT
AC_OUTPUT
@@ -44,7 +44,7 @@
test -d m4 || { rm -f m4 && mkdir m4; }
-rm -f m4/libtool.m4 m4/ltoptions.m4 config/ltmain.sh
+rm -f m4/libtool.m4 m4/ltoptions.m4 build-aux/ltmain.sh
# This file should be upgraded.
AT_DATA([m4/libtool.m4], [[
@@ -57,16 +57,16 @@
# serial 99999 ltoptions.m4
]])
-test -d config || { rm -f config && mkdir config; }
+test -d build-aux || { rm -f build-aux && mkdir build-aux; }
# This file has a very high serial number, and needs --force to be updated.
-AT_DATA([config/ltmain.sh], [[
+AT_DATA([build-aux/ltmain.sh], [[
package_revision=9999.9999
]])
# This file has a very old serial number, but should be left unchanged
# unless the --install flag is invoked.
-AT_DATA([config/config.guess], [[
+AT_DATA([build-aux/config.guess], [[
timestamp='1970-01-01'
]])
])# LT_LIBTOOLIZE_SETUP
@@ -81,8 +81,8 @@
_LT_CONFIGURE_AC
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: copying file `config/ltmain.sh'
+[[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_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
@@ -111,7 +111,7 @@
## -------------------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltsugar.m4'
@@ -120,7 +120,7 @@
]])
AT_DATA(experr,
-[[libtoolize: `config/ltmain.sh' is newer: use `--force' to overwrite
+[[libtoolize: `build-aux/ltmain.sh' is newer: use `--force' to overwrite
libtoolize: `m4/ltoptions.m4' is newer: use `--force' to overwrite
]])
@@ -132,7 +132,7 @@
## ---------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
@@ -141,7 +141,7 @@
]])
AT_DATA(experr,
-[[libtoolize: `config/ltmain.sh' is newer: use `--force' to overwrite
+[[libtoolize: `build-aux/ltmain.sh' is newer: use `--force' to overwrite
libtoolize: `m4/ltoptions.m4' is newer: use `--force' to overwrite
]])
@@ -153,8 +153,8 @@
## ----------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: copying file `config/ltmain.sh'
+[[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_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
@@ -171,8 +171,8 @@
## --------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: `config/ltmain.sh' is already up to date.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: `build-aux/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
libtoolize: `m4/ltoptions.m4' is already up to date.
@@ -202,10 +202,10 @@
## -------------------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: copying file `config/config.guess'
-libtoolize: copying file `config/config.sub'
-libtoolize: copying file `config/install-sh'
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/config.guess'
+libtoolize: copying file `build-aux/config.sub'
+libtoolize: copying file `build-aux/install-sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltsugar.m4'
@@ -214,7 +214,7 @@
]])
AT_DATA(experr,
-[[libtoolize: `config/ltmain.sh' is newer: use `--force' to overwrite
+[[libtoolize: `build-aux/ltmain.sh' is newer: use `--force' to overwrite
libtoolize: `m4/ltoptions.m4' is newer: use `--force' to overwrite
]])
@@ -226,10 +226,10 @@
## ---------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: `config/config.guess' is already up to date.
-libtoolize: `config/config.sub' is already up to date.
-libtoolize: `config/install-sh' is already up to date.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: `build-aux/config.guess' is already up to date.
+libtoolize: `build-aux/config.sub' is already up to date.
+libtoolize: `build-aux/install-sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
@@ -238,7 +238,7 @@
]])
AT_DATA(experr,
-[[libtoolize: `config/ltmain.sh' is newer: use `--force' to overwrite
+[[libtoolize: `build-aux/ltmain.sh' is newer: use `--force' to overwrite
libtoolize: `m4/ltoptions.m4' is newer: use `--force' to overwrite
]])
@@ -250,11 +250,11 @@
## ----------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: copying file `config/config.guess'
-libtoolize: copying file `config/config.sub'
-libtoolize: copying file `config/install-sh'
-libtoolize: copying file `config/ltmain.sh'
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/config.guess'
+libtoolize: copying file `build-aux/config.sub'
+libtoolize: copying file `build-aux/install-sh'
+libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
@@ -271,11 +271,11 @@
## --------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: `config/config.guess' is already up to date.
-libtoolize: `config/config.sub' is already up to date.
-libtoolize: `config/install-sh' is already up to date.
-libtoolize: `config/ltmain.sh' is already up to date.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: `build-aux/config.guess' is already up to date.
+libtoolize: `build-aux/config.sub' is already up to date.
+libtoolize: `build-aux/install-sh' is already up to date.
+libtoolize: `build-aux/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
libtoolize: `m4/ltoptions.m4' is already up to date.
@@ -288,6 +288,74 @@
AT_CLEANUP
+
+## ----------------------------------------------------------------- ##
+## Ensure libtoolize works when LT_CONFIG_LTDL_DIR is not specified. ##
+## ----------------------------------------------------------------- ##
+
+AT_SETUP([diagnose missing LT_CONFIG_LTDL_DIR])
+
+AT_DATA(expout,
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/config.guess'
+libtoolize: copying file `build-aux/config.sub'
+libtoolize: copying file `build-aux/install-sh'
+libtoolize: copying file `build-aux/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: copying file `m4/argz.m4'
+libtoolize: copying file `m4/libtool.m4'
+libtoolize: copying file `m4/ltdl.m4'
+libtoolize: copying file `m4/ltoptions.m4'
+libtoolize: copying file `m4/ltsugar.m4'
+libtoolize: copying file `m4/ltversion.m4'
+libtoolize: copying file `m4/lt~obsolete.m4'
+libtoolize: putting libltdl files in `ltdl'.
+libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/argz_.h'
+libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
+libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
+libtoolize: copying file `ltdl/libltdl/lt__private.h'
+libtoolize: copying file `ltdl/libltdl/lt__strl.h'
+libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
+libtoolize: copying file `ltdl/libltdl/lt_error.h'
+libtoolize: copying file `ltdl/libltdl/lt_system.h'
+libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt_dlloader.c'
+libtoolize: copying file `ltdl/lt_error.c'
+libtoolize: copying file `ltdl/ltdl.c'
+libtoolize: copying file `ltdl/ltdl.h'
+libtoolize: copying file `ltdl/slist.c'
+libtoolize: creating file `ltdl/Makefile.inc'
+libtoolize: Remember to add `LT_CONFIG_LTDL_DIR([ltdl])' to `configure.ac'.
+]])
+
+AT_DATA([configure.ac],
+[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+LT_INIT
+LTDL_INIT([nonrecursive])
+AC_OUTPUT
+]])
+
+LT_AT_CHECK_LIBTOOLIZE([--copy --install --ltdl=ltdl], 0, expout)
+
+AT_CLEANUP
+
+
## ---------------------------- ##
## Make sure ltdl.m4 is copied. ##
## ---------------------------- ##
@@ -297,7 +365,15 @@
# Macro to generate data files common to several tests.
m4_pushdef([_LT_AT_LTDL_SETUP],
[AT_DATA(expout,
-[[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `ltdl/config'.
+libtoolize: linking file `ltdl/config/compile'
+libtoolize: linking file `ltdl/config/config.guess'
+libtoolize: linking file `ltdl/config/config.sub'
+libtoolize: linking file `ltdl/config/depcomp'
+libtoolize: linking file `ltdl/config/install-sh'
+libtoolize: linking file `ltdl/config/missing'
+libtoolize: linking file `ltdl/config/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
libtoolize: linking file `ltdl/m4/argz.m4'
libtoolize: linking file `ltdl/m4/libtool.m4'
libtoolize: linking file `ltdl/m4/ltdl.m4'
@@ -305,6 +381,7 @@
libtoolize: linking file `ltdl/m4/ltsugar.m4'
libtoolize: linking file `ltdl/m4/ltversion.m4'
libtoolize: linking file `ltdl/m4/lt~obsolete.m4'
+libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: linking file `ltdl/COPYING.LIB'
libtoolize: linking file `ltdl/README'
libtoolize: linking file `ltdl/Makefile.am'
@@ -339,13 +416,6 @@
libtoolize: linking file `ltdl/ltdl.c'
libtoolize: linking file `ltdl/ltdl.h'
libtoolize: linking file `ltdl/slist.c'
-libtoolize: linking file `ltdl/config/compile'
-libtoolize: linking file `ltdl/config/config.guess'
-libtoolize: linking file `ltdl/config/config.sub'
-libtoolize: linking file `ltdl/config/depcomp'
-libtoolize: linking file `ltdl/config/install-sh'
-libtoolize: linking file `ltdl/config/missing'
-libtoolize: linking file `ltdl/config/ltmain.sh'
]])
AT_DATA([configure.ac],
@@ -390,7 +460,15 @@
AT_SETUP([diagnose missing LTDL_INIT invocation])
AT_DATA(expout,
-[[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `ltdl/config'.
+libtoolize: copying file `ltdl/config/compile'
+libtoolize: copying file `ltdl/config/config.guess'
+libtoolize: copying file `ltdl/config/config.sub'
+libtoolize: copying file `ltdl/config/depcomp'
+libtoolize: copying file `ltdl/config/install-sh'
+libtoolize: copying file `ltdl/config/missing'
+libtoolize: copying file `ltdl/config/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
libtoolize: copying file `ltdl/m4/argz.m4'
libtoolize: copying file `ltdl/m4/libtool.m4'
libtoolize: copying file `ltdl/m4/ltdl.m4'
@@ -398,6 +476,7 @@
libtoolize: copying file `ltdl/m4/ltsugar.m4'
libtoolize: copying file `ltdl/m4/ltversion.m4'
libtoolize: copying file `ltdl/m4/lt~obsolete.m4'
+libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
libtoolize: copying file `ltdl/COPYING.LIB'
libtoolize: copying file `ltdl/README'
libtoolize: copying file `ltdl/Makefile.am'
@@ -432,13 +511,6 @@
libtoolize: copying file `ltdl/ltdl.c'
libtoolize: copying file `ltdl/ltdl.h'
libtoolize: copying file `ltdl/slist.c'
-libtoolize: copying file `ltdl/config/compile'
-libtoolize: copying file `ltdl/config/config.guess'
-libtoolize: copying file `ltdl/config/config.sub'
-libtoolize: copying file `ltdl/config/depcomp'
-libtoolize: copying file `ltdl/config/install-sh'
-libtoolize: copying file `ltdl/config/missing'
-libtoolize: copying file `ltdl/config/ltmain.sh'
libtoolize: Remember to add `LTDL_INIT' to configure.ac.
]])
@@ -465,14 +537,14 @@
AT_DATA([configure.ac],
[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
LT_INIT
AC_OUTPUT
]])
[cat >expout <<EOF
-libtoolize: putting files in AC_CONFIG_AUX_DIR, \`config'.
-libtoolize: copying file \`config/ltmain.sh'
+libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, \`build-aux'.
+libtoolize: copying file \`build-aux/ltmain.sh'
libtoolize: You should add the contents of the following files to
\`aclocal.m4':
libtoolize: \`$tst_aclocaldir/libtool.m4'
libtoolize: \`$tst_aclocaldir/ltoptions.m4'
@@ -490,7 +562,7 @@
AT_DATA([configure.ac],
[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
LT_INIT
AC_OUTPUT
@@ -510,8 +582,8 @@
]])
AT_DATA([expout],
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: `config/ltmain.sh' is already up to date.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: `build-aux/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
@@ -546,8 +618,8 @@
]])
AT_DATA([expout],
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: `config/ltmain.sh' is already up to date.
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: `build-aux/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: `m4/ltsugar.m4' is already up to date.
@@ -566,8 +638,8 @@
## ----------------------------------------------------------- ##
AT_DATA(expout,
-[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
-libtoolize: copying file `config/ltmain.sh'
+[[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_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
@@ -579,3 +651,161 @@
LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)
AT_CLEANUP
+
+
+## ------------------------------------------------------------- ##
+## Check nonrecursive ltdl puts m4 files in AC_CONFIG_MACRO_DIR. ##
+## ------------------------------------------------------------- ##
+
+AT_SETUP([nonrecursive ltdl with AC_CONFIG_MACRO_DIR])
+
+AT_DATA(expout,
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/config.guess'
+libtoolize: copying file `build-aux/config.sub'
+libtoolize: copying file `build-aux/install-sh'
+libtoolize: copying file `build-aux/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
+libtoolize: copying file `m4/argz.m4'
+libtoolize: copying file `m4/libtool.m4'
+libtoolize: copying file `m4/ltdl.m4'
+libtoolize: copying file `m4/ltoptions.m4'
+libtoolize: copying file `m4/ltsugar.m4'
+libtoolize: copying file `m4/ltversion.m4'
+libtoolize: copying file `m4/lt~obsolete.m4'
+libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
+libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/argz_.h'
+libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
+libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
+libtoolize: copying file `ltdl/libltdl/lt__private.h'
+libtoolize: copying file `ltdl/libltdl/lt__strl.h'
+libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
+libtoolize: copying file `ltdl/libltdl/lt_error.h'
+libtoolize: copying file `ltdl/libltdl/lt_system.h'
+libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt_dlloader.c'
+libtoolize: copying file `ltdl/lt_error.c'
+libtoolize: copying file `ltdl/ltdl.c'
+libtoolize: copying file `ltdl/ltdl.h'
+libtoolize: copying file `ltdl/slist.c'
+libtoolize: creating file `ltdl/Makefile.inc'
+]])
+
+AT_DATA([configure.ac],
+[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
+LT_CONFIG_LTDL_DIR([ltdl])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+LT_INIT
+LTDL_INIT([nonrecursive])
+AC_OUTPUT
+]])
+
+LT_AT_CHECK_LIBTOOLIZE([--copy --install --ltdl=ltdl], 0, expout)
+
+AT_CLEANUP
+
+
+## -------------------------------------------------------- ##
+## Check subproject ltdl with non-shared AC_CONFIG_.*_DIRs. ##
+## -------------------------------------------------------- ##
+
+AT_SETUP([subproject ltdl with non-shared directories])
+
+AT_DATA(expout,
+[[libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
+libtoolize: copying file `build-aux/config.guess'
+libtoolize: copying file `build-aux/config.sub'
+libtoolize: copying file `build-aux/install-sh'
+libtoolize: copying file `build-aux/ltmain.sh'
+libtoolize: putting auxiliary files in `build-aux'.
+libtoolize: copying file `ltdl/config/compile'
+libtoolize: copying file `ltdl/config/config.guess'
+libtoolize: copying file `ltdl/config/config.sub'
+libtoolize: copying file `ltdl/config/depcomp'
+libtoolize: copying file `ltdl/config/install-sh'
+libtoolize: copying file `ltdl/config/missing'
+libtoolize: copying file `ltdl/config/ltmain.sh'
+libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `acm4'.
+libtoolize: copying file `acm4/argz.m4'
+libtoolize: copying file `acm4/libtool.m4'
+libtoolize: copying file `acm4/ltdl.m4'
+libtoolize: copying file `acm4/ltoptions.m4'
+libtoolize: copying file `acm4/ltsugar.m4'
+libtoolize: copying file `acm4/ltversion.m4'
+libtoolize: copying file `acm4/lt~obsolete.m4'
+libtoolize: putting macros in `ltdl/m4'.
+libtoolize: copying file `ltdl/m4/argz.m4'
+libtoolize: copying file `ltdl/m4/libtool.m4'
+libtoolize: copying file `ltdl/m4/ltdl.m4'
+libtoolize: copying file `ltdl/m4/ltoptions.m4'
+libtoolize: copying file `ltdl/m4/ltsugar.m4'
+libtoolize: copying file `ltdl/m4/ltversion.m4'
+libtoolize: copying file `ltdl/m4/lt~obsolete.m4'
+libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
+libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/Makefile.am'
+libtoolize: copying file `ltdl/configure.ac'
+libtoolize: copying file `ltdl/aclocal.m4'
+libtoolize: copying file `ltdl/Makefile.in'
+libtoolize: copying file `ltdl/config-h.in'
+libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/argz_.h'
+libtoolize: copying file `ltdl/argz.c'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+libtoolize: copying file `ltdl/loaders/loadlibrary.c'
+libtoolize: copying file `ltdl/loaders/shl_load.c'
+libtoolize: copying file `ltdl/lt__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
+libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
+libtoolize: copying file `ltdl/libltdl/lt__private.h'
+libtoolize: copying file `ltdl/libltdl/lt__strl.h'
+libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
+libtoolize: copying file `ltdl/libltdl/lt_error.h'
+libtoolize: copying file `ltdl/libltdl/lt_system.h'
+libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/preopen.c'
+libtoolize: copying file `ltdl/lt__alloc.c'
+libtoolize: copying file `ltdl/lt_dlloader.c'
+libtoolize: copying file `ltdl/lt_error.c'
+libtoolize: copying file `ltdl/ltdl.c'
+libtoolize: copying file `ltdl/ltdl.h'
+libtoolize: copying file `ltdl/slist.c'
+libtoolize: Consider using `AC_CONFIG_AUX_DIR([ltdl/config])' in
configure.ac.
+libtoolize: Consider using `AC_CONFIG_MACRO_DIR([ltdl/m4])' in configure.ac.
+]])
+
+AT_DATA([configure.ac],
+[[AC_INIT([libtoolize-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
+LT_CONFIG_LTDL_DIR([ltdl])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([acm4])
+LT_INIT
+LTDL_INIT([subproject])
+AC_OUTPUT
+]])
+
+LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout)
+
+AT_CLEANUP
+
--
())_. Email me: [EMAIL PROTECTED]
( '/ Read my blog: http://blog.azazil.net
/ )= ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils
pgpUlwbvjGTX6.pgp
Description: PGP signature
