From: jbj <devnull@localhost>
Date: Wed, 9 Jun 1999 14:13:31 +0000 (+0000)
Subject: don't clobber LDFLAGS in top-level Makefile (Tim Mooney).
X-Git-Tag: rpm-4.4-release~2838
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00425624b6a6af73226a5cea5e7547f29fb84490;p=platform%2Fupstream%2Frpm.git

don't clobber LDFLAGS in top-level Makefile (Tim Mooney).
move libtool version forward.

CVS patchset: 3086
CVS date: 1999/06/09 14:13:31
---

diff --git a/CHANGES b/CHANGES
index a0c1994..55b3948 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
 	- move printDep* routines into rpmlib for gnorpm et al.
 	- updated ru translation (Sergey Kubushin).
 	- add vpkg-provides.sh (Tim Mooney).
+	- don't clobber LDFLAGS in top-level Makefile (Tim Mooney).
 
 3.0 -> 3.0.1
 	- fix: %verifyscript resurrected (Shing-Gene Yung).
diff --git a/autogen.sh b/autogen.sh
index 2b88a59..436fc17 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-LTV="libtoolize (GNU libtool) 1.2f"
+LTV="libtoolize (GNU libtool) 1.3"
 ACV="Autoconf version 2.13"
 AMV="automake (GNU automake) 1.4"
 USAGE="
 You need to install:
-	libtool-1.2f
+	libtool-1.3
 	autoconf-2.13
 	automake-1.4
 "
diff --git a/configure.in b/configure.in
index db07a08..6a24dcf 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ else
 	# just link it dynamically
 	LDFLAGS_STATIC=""
 fi
-LDFLAGS_STATIC="${LDFLAGS_STATIC}-static"	# libtool format
+LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}-static"	# libtool format
 AC_MSG_RESULT($LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_STATIC)
 
diff --git a/rpm.spec b/rpm.spec
index f7c9ae2..7adebfd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.2
 Version: %{version}
-Release: 0.1
+Release: 0.2
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL