From 50a4b35245bbdb0cfca5d62bc4295a2b2e4f1e87 Mon Sep 17 00:00:00 2001 From: Paul Jarc Date: Sun, 4 Jan 2009 21:27:41 -0500 Subject: [PATCH] configure clobbers LDFLAGS In a couple of tests, configure clobbers the LDFLAGS value set by the caller. This patch fixes it. Signed-off-by: Junio C Hamano --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8821b5080..0a5fc8c6f 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ else SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no]) - LDFLAGS="${SAVE_LD_FLAGS}" + LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$ld_wl_rpath" = "yes"; then AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,]) @@ -136,7 +136,7 @@ else SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -rpath /" AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no]) - LDFLAGS="${SAVE_LD_FLAGS}" + LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$ld_rpath" = "yes"; then AC_SUBST(CC_LD_DYNPATH, [-rpath]) -- 2.30.2