* 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.

diff --git a/ChangeLog b/ChangeLog
index 9f98742370b38076663c0fbeca0b6843fdde2d13..22b89a02ba4d61076986a0d0d23379c64d82b8f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2004-02-06  Gary V. Vaughan  <gary@gnu.org>
+
+       * 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.
+
 2004-02-05  Peter O'Gorman  <peter@pogma.com>
-       
+
        * ltmain.in (infer_tag, win32_libid): Style changes. Rename
        infer_tag to func_infer_tag and win32_libid to func_win32_libid.
        * m4/libtool.m4 (cygwin): rename win32_libid to func_win32_libid.
-       
+
 2004-02-04  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in (infer_tag): Move tag inferrence to a shell function.
@@ -28,7 +35,7 @@
 
 2004-01-31  Peter O'Gorman  <peter@pogma.com>
 
-       * m4/libtool.m4 (_LT_CONFIG_STATUS_DECLARE): Change `echo to 
+       * m4/libtool.m4 (_LT_CONFIG_STATUS_DECLARE): Change `echo to
        `$echo, causes problems when builtin echo is broken. Reported
        by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
 

diff --git a/NEWS b/NEWS
index 8bc31ff5a32f7dcef2eb972ec2db6d5154535fb1..68fc53c0fdfb45b41ef7c2dba0df418c62df17a5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/doc/libtool.texi b/doc/libtool.texi
index bacdf4f8efeb0fe12fee28e0564951e2545e6080..87e43991179a523de61adc3fbd74d19fddd29b03 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1638,6 +1638,17 @@ If you are using GNU Autoconf (or Automake), you should add a call to
 adds many new tests to the @code{configure} script so that the generated
 libtool script will understand the characteristics of the host:
 
+@defmac 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
+@var{version}, print an error message to the standard
+error output and exit with failure (exit status is 63).  For example:
+
+@example
+LT_PREREQ(@value{VERSION})
+@end example
+@end defmac
+
 @defmac AC_PROG_LIBTOOL
 @defmacx AM_PROG_LIBTOOL
 Add support for the @samp{--enable-shared} and @samp{--disable-shared}

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 43924aab354d2dd86c7e19c2ddd2b26e4a0f5ae4..04ce04384d6c3a2af14b603d700395dc178dcb7e 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -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],