[Xfce4-commits] [xfce/xfce4-dev-tools] 06/08: Use the correct libtool version number in the xdt-autogen warning

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/xfce4-dev-tools.

commit 9c0e7524f0659a2c4867e8bb007bd5c0d0282512
Author: Harald Judt <h.judt at gmx.at>
Date:   Tue Feb 17 21:30:35 2015 +0100

    Use the correct libtool version number in the xdt-autogen warning
    
    Commit de3d7f0 "Display warning if AC_PROG_INTLTOOL is used (bug #8930)"
    prints a warning with a hardcoded libtool version. This patch replaces
    the hardcoded value with the version number defined in configure.ac.in,
    so developers will use the proper requirements.
---
 configure.ac.in           |   10 +++++++++-
 scripts/xdt-autogen.in.in |    2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index bb73c78..9469ae9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -50,7 +50,15 @@ dnl ********************************
 AC_PROG_CC()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
-LT_PREREQ([2.4])
+
+dnl The libtool version is not only used here, but also in a warning
+dnl in the xdt-autogen script (to not confuse developers using
+dnl xfce4-dev-tools). Maybe one day this warning will become obsolete,
+dnl then it is safe to only use the version directly in the LT_PREREQ
+dnl statement, until then it is necessary to define it as is.
+m4_define([xdt_version_libtool], [2.4])
+AC_SUBST([VERSION_LIBTOOL], [xdt_version_libtool])
+LT_PREREQ(xdt_version_libtool())
 LT_INIT([disable-static])
 
 dnl ***************************************
diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index 3eca0d5..810b10e 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -429,7 +429,7 @@ for configure_ac_file in $CONFIGURE_AC_FILES; do
   runlibtoolize=0
   if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
   cat >&2 <<EOF
-xdt-autogen: It is recommended to use LT_PREREQ([2.2.6]) and
+xdt-autogen: It is recommended to use LT_PREREQ([@VERSION_LIBTOOL@]) and
              LT_INIT([disable-static]) in your configure.ac
              file and remove AC_PROG_LIBTOOL and AC_DISABLE_STATIC.
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.