mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* libltdl/m4/lt~obsolete.m4 (LTOBSOLETE_VERSION): New macro, to
force-pull in this file by aclocal. * libltdl/m4/libtool.m4 (LT_INIT): Require LTOBSOLETE_VERSION. * tests/libtoolize.at (upgrading verbatim style aclocal.m4): Adjust. Report by H. J. Lu <hjl@lucon.org>.
This commit is contained in:
parent
3679372cbb
commit
35526d6c64
@ -1,5 +1,12 @@
|
||||
2007-07-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* libltdl/m4/lt~obsolete.m4 (LTOBSOLETE_VERSION): New macro, to
|
||||
force-pull in this file by aclocal.
|
||||
* libltdl/m4/libtool.m4 (LT_INIT): Require LTOBSOLETE_VERSION.
|
||||
* tests/libtoolize.at (upgrading verbatim style aclocal.m4):
|
||||
Adjust.
|
||||
Report by H. J. Lu <hjl@lucon.org>.
|
||||
|
||||
* libltdl/ltdl.c (tryall_dlopen): Rename argument to have typed
|
||||
alias of `advise' instead of allocating a copy. Fixes memleak.
|
||||
|
||||
|
3
libltdl/m4/libtool.m4
vendored
3
libltdl/m4/libtool.m4
vendored
@ -37,7 +37,7 @@ m4_define([_LT_COPYING], [dnl
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
])
|
||||
|
||||
# serial 53 LT_INIT
|
||||
# serial 54 LT_INIT
|
||||
|
||||
|
||||
# LT_PREREQ(VERSION)
|
||||
@ -66,6 +66,7 @@ dnl unless we require an AC_DEFUNed macro:
|
||||
AC_REQUIRE([LTOPTIONS_VERSION])dnl
|
||||
AC_REQUIRE([LTSUGAR_VERSION])dnl
|
||||
AC_REQUIRE([LTVERSION_VERSION])dnl
|
||||
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
|
||||
m4_require([_LT_PROG_LTMAIN])dnl
|
||||
m4_require([_LT_SET_OPTIONS], [_LT_SET_OPTIONS([$1])])dnl
|
||||
|
||||
|
7
libltdl/m4/lt~obsolete.m4
vendored
7
libltdl/m4/lt~obsolete.m4
vendored
@ -1,13 +1,13 @@
|
||||
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
|
||||
# Written by Scott James Remnant, 2004.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation gives
|
||||
# unlimited permission to copy and/or distribute it, with or without
|
||||
# modifications, as long as this notice is preserved.
|
||||
|
||||
# serial 2
|
||||
# serial 3
|
||||
|
||||
# These exist entirely to fool aclocal when bootstrapping libtool.
|
||||
#
|
||||
@ -32,6 +32,9 @@
|
||||
# we give up compatibility with versions before 1.7, at which point
|
||||
# we need to keep only those names which we still refer to.
|
||||
|
||||
# This is to help aclocal find these macros, as it can't see m4_define.
|
||||
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
|
||||
|
||||
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
|
||||
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
|
||||
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
|
||||
|
@ -1,6 +1,6 @@
|
||||
# libtoolize.at -- test libtoolize operation -*- Autotest -*-
|
||||
#
|
||||
# Copyright (C) 2005 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
|
||||
# Written by Gary V. Vaughan, 2005
|
||||
#
|
||||
# This file is part of GNU Libtool.
|
||||
@ -457,7 +457,6 @@ libtoolize: copying file `m4/libtool.m4'
|
||||
libtoolize: `m4/ltsugar.m4' is already up to date.
|
||||
libtoolize: `m4/ltversion.m4' is already up to date.
|
||||
libtoolize: `m4/lt~obsolete.m4' is already up to date.
|
||||
libtoolize: You should add the contents of `m4/lt~obsolete.m4' to `aclocal.m4'.
|
||||
]])
|
||||
|
||||
AT_DATA([experr],
|
||||
@ -479,7 +478,6 @@ 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: You should add the contents of `m4/lt~obsolete.m4' to `aclocal.m4'.
|
||||
]])
|
||||
|
||||
LT_AT_CHECK_LIBTOOLIZE([--copy --force], 0, expout)
|
||||
|
Loading…
Reference in New Issue
Block a user