Attachment 675590 Details for Bug 606452 – Proposed fix.

[patch] Proposed fix.

libtool-1.5.22-unset-builtin.patch (text/plain), 1.43 KB, created by Pavel Raiskup on 2013-01-09 14:43:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2013-01-09 14:43:33 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/Makefile.am b/Makefile.am
>index 6ba4803..a79865d 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -14,6 +14,7 @@ LDFLAGS = @LDFLAGS@
> LIBS= @LIBS@
> FFLAGS = @FFLAGS@
> FLIBS = @FLIBS@
>+LT_UNSET= @LT_UNSET@
> 
> aclocal_macros = libtool.m4 ltdl.m4
> 
>@@ -67,8 +68,9 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS)
> 	-rm -f ltmain.shT
> 	date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
> 	sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
>+	    -e 's/@''LT_UNSET@/@LT_UNSET@/' \
> 	    -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
>-	mv -f ltmain.shT $@ || \
>+	cp -f ltmain.shT $@ || \
> 	(rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
> 	cp $@ $(srcdir)/libltdl/
> 
>diff --git a/configure.ac b/configure.ac
>index 26a345a..3f37795 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -47,7 +47,12 @@ case AC_PACKAGE_VERSION in
> esac
> AC_SUBST([TIMESTAMP])
> 
>-
>+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
>+    LT_UNSET="unset"
>+else
>+    LT_UNSET="false"
>+fi
>+AC_SUBST([LT_UNSET])
> 
> ## ------------------------ ##
> ## Automake Initialisation. ##
>diff --git a/ltmain.in b/ltmain.in
>index 92473c8..9362fd1 100644
>--- a/ltmain.in
>+++ b/ltmain.in
>@@ -46,6 +46,8 @@ PACKAGE=@PACKAGE@
> VERSION=@VERSION@
> TIMESTAMP="@TIMESTAMP@"
> 
>+lt_unset=@LT_UNSET@
>+
> # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
> if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
>   emulate sh

Actions: View | Diff

Attachments on bug 606452: 675590