* libtoolize.m4sh (func_install_pkgconfig_files): Only call

func_install_pkgconfig_parent if $seen_autoconf.
* tests/standalone.at (compiling softlinked libltdl)
(compiling copied libltdl, installable libltdl)
(linking libltdl without autotools): Use checked libtoolize
calls to catch warnings.
This commit is contained in:
Ralf Wildenhues 2008-02-14 04:36:37 +00:00
parent e957206e71
commit 6637bfe8bb
3 changed files with 17 additions and 6 deletions

View File

@ -1,3 +1,12 @@
2008-02-14 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libtoolize.m4sh (func_install_pkgconfig_files): Only call
func_install_pkgconfig_parent if $seen_autoconf.
* tests/standalone.at (compiling softlinked libltdl)
(compiling copied libltdl, installable libltdl)
(linking libltdl without autotools): Use checked libtoolize
calls to catch warnings.
2008-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libltdl/configure.ac: Bump package version.

View File

@ -1202,7 +1202,9 @@ func_install_pkgconfig_files ()
elif $opt_ltdl && test "x$ltdl_mode" = "xsubproject"
# && test "x$auxdir" != "x$subproject_auxdir" is implied
then
func_install_pkgconfig_parent
if $seen_autoconf; then
func_install_pkgconfig_parent
fi
func_install_pkgconfig_subproject
# 3. Not subproject, but AC_CONFIG_AUX_DIR was used in parent:

View File

@ -1,6 +1,6 @@
# standalone.at -- test standalone libltdl builds -*- Autotest -*-
#
# Copyright (C) 2005 Free Software Foundation, Inc.
# Copyright (C) 2005, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2006
#
# This file is part of GNU Libtool.
@ -30,7 +30,7 @@ AT_BANNER([Standalone Libltdl.])
AT_SETUP([compiling softlinked libltdl])
LT_AT_LIBTOOLIZE([--ltdl=.])
LT_AT_CHECK_LIBTOOLIZE([--ltdl=.], [], [ignore])
LT_AT_CONFIGURE
LT_AT_MAKE([all $tst_dist])
@ -45,7 +45,7 @@ AT_CLEANUP
AT_SETUP([compiling copied libltdl])
LT_AT_LIBTOOLIZE([--copy --ltdl=.])
LT_AT_CHECK_LIBTOOLIZE([--copy --ltdl=.], [], [ignore])
LT_AT_CONFIGURE
LT_AT_MAKE([all $tst_dist])
@ -62,7 +62,7 @@ AT_SETUP([installable libltdl])
prefix=`pwd`/_inst
LT_AT_LIBTOOLIZE([--copy --ltdl=.])
LT_AT_CHECK_LIBTOOLIZE([--copy --ltdl=.], [], [ignore])
LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
LT_AT_MAKE([all install $tst_dist])
@ -79,7 +79,7 @@ AT_CLEANUP
AT_SETUP([linking libltdl without autotools])
_LTDL_PROJECT_FILES([libltdl])
LT_AT_LIBTOOLIZE([--copy --ltdl])
LT_AT_CHECK_LIBTOOLIZE([--copy --ltdl], [], [ignore])
LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
CONFIGURE_OPTIONS="$configure_options"])