summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ddd93b)
raw | patch | inline | side by side (parent: 0ddd93b)
author | Paul Jarc <prj@po.cwru.edu> | |
Mon, 5 Jan 2009 02:27:41 +0000 (21:27 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 6 Jan 2009 03:46:19 +0000 (19:46 -0800) |
In a couple of tests, configure clobbers the LDFLAGS value set by the
caller. This patch fixes it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
caller. This patch fixes it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
configure.ac | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 8821b5080af2eb3ec8cabd3ae40ee20e10c80f2e..0a5fc8c6f6f91099c3c5df10f08240e547126e0a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
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,])
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])