78-gary-LT_PREREQ.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to commit?
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAI4AQFRMICSmD1gYRArz8AJ47A+4pm+YiwCzSIHIuv9wfTTV84QCeOkIz
1hwISbCr9qKKpxHeIiQmvkg=
=6LtX
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * m4/libtool.m4 (LT_PREREQ): Declare the minimum release number
        that is required for the calling code.
        * doc/libtool.texi (AC_PROG_LIBTOOL): Document it.
        * NEWS: Updated.

Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.133
diff -u -p -u -r1.133 NEWS
--- NEWS 25 Jan 2004 13:41:21 -0000 1.133
+++ NEWS 6 Feb 2004 11:42:30 -0000
@@ -1,6 +1,7 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.5b: 2004-??-??; CVS version 1.5a, Libtool team:
+* New LT_PREREQ macro for specifying minimum libtool requirement.
 * Like automake, libtoolize no longer installs config.guess and config.sub by
   default.  Use new --install option to get the old behaviour.
 * libtool script is now created by config.status.  Instead of interrogating
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.37
diff -u -p -u -r1.37 libtool.m4
--- m4/libtool.m4 5 Feb 2004 14:53:16 -0000 1.37
+++ m4/libtool.m4 6 Feb 2004 11:42:32 -0000
@@ -39,6 +39,17 @@ m4_ifdef([AC_PROVIDE_IFELSE],
                 [m4_ifdef([AC_PROVIDE_$1],
                           [$2], [$3])])])
 
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_define([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+                  [m4_fatal([Libtool version $1 or higher is required],
+                            63)])],
+       [$2])])
+
+
 # AC_PROG_LIBTOOL
 # ---------------
 AC_DEFUN([AC_PROG_LIBTOOL],
Index: doc/libtool.texi
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.147
diff -u -p -u -r1.147 libtool.texi
--- doc/libtool.texi 12 Jan 2004 02:32:50 -0000 1.147
+++ doc/libtool.texi 6 Feb 2004 11:42:34 -0000
@@ -1638,6 +1638,17 @@ If you are using GNU Autoconf (or Automa
 adds many new tests to the @code{configure} script so that the generated
 libtool script will understand the characteristics of the host:
 
address@hidden LT_PREREQ(@var{VERSION})
+Ensure that a recent enough version of Libtool is being used.  If the
+version of Libtool used for @code{AC_PROG_LIBTOOL} is earlier than
address@hidden, print an error message to the standard
+error output and exit with failure (exit status is 63).  For example:
+
address@hidden
+LT_PREREQ(@value{VERSION})
address@hidden example
address@hidden defmac
+
 @defmac AC_PROG_LIBTOOL
 @defmacx AM_PROG_LIBTOOL
 Add support for the @samp{--enable-shared} and @samp{--disable-shared}