From: Scott James Remnant <scott@netsplit.com>
Date: Thu, 12 Feb 2004 22:32:01 +0000 (+0000)
Subject: * ltmain.in: Remove duplicated version checking block.
X-Git-Tag: release-1-9b~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c96c655eb4a07efbd91684df302cee665445b582;p=thirdparty%2Flibtool.git

* ltmain.in: Remove duplicated version checking block.
---

diff --git a/ChangeLog b/ChangeLog
index fd8c77e6b..7cbb51f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-12  Scott James Remnant  <scott@netsplit.com>
 
+	* ltmain.in: Remove duplicated version checking block.
+
 	* bootstrap, m4/libtool.m4: Argh, Gary went crazy after cvsapply
 	went crazy and backed out more than he should've.  This patch puts
 	some of it back again.
diff --git a/ltmain.in b/ltmain.in
index ffc7ef229..40f2f1799 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -113,39 +113,6 @@ _LT_EOF
   exit $EXIT_MISMATCH
 fi
 
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-package_revision=`( set $TIMESTAMP; echo $1; )`
-if test "$package_revision" != "$macro_revision"; then
-  if test "$VERSION" != "$macro_version"; then
-    if test -z "$macro_version"; then
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this AC_PROG_LIBTOOL comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this AC_PROG_LIBTOOL comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-    fi
-  else
-    cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition used by this AC_PROG_LIBTOOL comes from revision
-$progname: $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-  fi
-
-  exit $EXIT_MISMATCH
-fi
-
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
 Xsed="${SED}"' -e 1s/^X//'