diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2005-04-01 12:23:55 +0000 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2005-04-01 12:23:55 +0000 |
| commit | 86a2d89ea5aa5427ceee7da09804830448ea12af (patch) | |
| tree | f1c075c0e2a8222cc718ece5a79d26cd884650bf /configure.ac | |
| parent | d92270911acc717e3d3df8c142963d1a990a1bff (diff) | |
| download | libtool-86a2d89ea5aa5427ceee7da09804830448ea12af.tar.gz | |
Most of the hair introduced ostensibly to enable testing of
uninstalled libtoolize isn't necessary if we allow overriding of
the libtool master copy directory:
* configure.ac (pkvmacrodir): No need to substitute this.
* Makefile.am (edit): No need to substitute pkgvmacrodir.
(dist_pkgvdata_DATA): Use nobase_ prefix so that these files are
installed to $(pkgvdatadir)/config.
(pkgvmacro_DATA): Renamed to...
(nobase_pkgvdata_DATA): ...this, so that files are installed to
$(pkgvdatadir)/m4.
(install-data-hook): Adjust.
* libtoolize.m4sh: Remove -I processing.
(func_filename_path_search): No longer required without -I.
Adjust all callers.
(pkgvltdldirs, pkgvmacrodirs): Deleted.
(pkgvdatadir): Allow overriding from the environment so that we
can write tests for uninstalled libtoolize.
(func_serial_update, func_ltmain_update, func_config_update):
Rename srcdirs parameter to srcdir, and don't call the path_search
function anymore. Adjust all callers.
(--install): Don't blindly copy all config files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dd19d1cf..d2df8479 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## Process this file with autoconf to create configure. -*- autoconf -*- -# Copyright (C) 2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -136,7 +136,6 @@ APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'` AC_SUBST([APIVERSION]) AC_SUBST([aclocaldir], ["\${datadir}/aclocal"]) AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"]) -AC_SUBST([pkgvmacrodir], ["\${datadir}/$PACKAGE-$APIVERSION/m4"]) AC_ARG_ENABLE(ltdl-install, [AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])]) |