@matheusbsbs / matheus-bagliano / commits / 50a4b35245
Fork 0

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 <gitster@pobox.com>

Paul Jarc committed Jan 4, 2009 at 21:27 UTC 50a4b35245bbdb0cfca5d62bc4295a2b2e4f1e87
1 file changed +2 -2
configure.ac
+2 -2
@@ -127,7 +127,7 @@ else
127 SAVE_LDFLAGS="${LDFLAGS}"
128 LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/"
129 AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_wl_rpath=yes], [ld_wl_rpath=no])
130 - LDFLAGS="${SAVE_LD_FLAGS}"
130 + LDFLAGS="${SAVE_LDFLAGS}"
131 ])
132 if test "$ld_wl_rpath" = "yes"; then
133 AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,])
@@ -136,7 +136,7 @@ else
136 SAVE_LDFLAGS="${LDFLAGS}"
137 LDFLAGS="${SAVE_LDFLAGS} -rpath /"
138 AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [ld_rpath=yes], [ld_rpath=no])
139 - LDFLAGS="${SAVE_LD_FLAGS}"
139 + LDFLAGS="${SAVE_LDFLAGS}"
140 ])
141 if test "$ld_rpath" = "yes"; then
142 AC_SUBST(CC_LD_DYNPATH, [-rpath])