mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-18 14:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* ltmain.in: Remove duplicated version checking block.

Browse Source
This commit is contained in:
Scott James Remnant 2004-02-12 22:32:01 +00:00
parent 707234675b
commit c96c655eb4
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2004-02-12 Scott James Remnant <scott@netsplit.com> 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 * bootstrap, m4/libtool.m4: Argh, Gary went crazy after cvsapply
went crazy and backed out more than he should've. This patch puts went crazy and backed out more than he should've. This patch puts
some of it back again. some of it back again.

33
ltmain.in
View File

@ -113,39 +113,6 @@ _LT_EOF
exit $EXIT_MISMATCH exit $EXIT_MISMATCH
fi 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 # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed="${SED}"' -e 1s/^X//' Xsed="${SED}"' -e 1s/^X//'