Commit b1f95f03 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2356] corrected ressoring LDFLAGS.

we should have used _SAVED; also we need to make a copy of LDFLAGS (in
LDFLAGS_SAVED) before extending it.  it now does both of these correctly.
parent 82c05da7
...@@ -71,12 +71,12 @@ fi ...@@ -71,12 +71,12 @@ fi
# make sure we have buildable libraries # make sure we have buildable libraries
AC_MSG_CHECKING([for BIND 10 common library]) AC_MSG_CHECKING([for BIND 10 common library])
BIND10_COMMON_LIB="-lb10-util -lb10-exceptions" BIND10_COMMON_LIB="-lb10-util -lb10-exceptions"
LDFLAGS="$LDFLAGS $BIND10_LDFLAGS" LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS_CHECK_COMMON="$LDFLAGS $BIND10_LDFLAGS"
LIBS="$LIBS $BIND10_COMMON_LIB" LIBS="$LIBS $BIND10_COMMON_LIB"
for d in $bind10_lib_dirs for d in $bind10_lib_dirs
do do
LDFLAGS_SAVED="$LDFLAGS" LDFLAGS="$LDFLAGS_CHECK_COMMON -L$d"
LDFLAGS="$LDFLAGS -L$d"
AC_TRY_LINK([ AC_TRY_LINK([
#include <util/buffer.h> #include <util/buffer.h>
],[ ],[
...@@ -85,7 +85,6 @@ isc::util::OutputBuffer buffer(0); ...@@ -85,7 +85,6 @@ isc::util::OutputBuffer buffer(0);
if test "x$BIND10_LDFLAGS" != "x"; then if test "x$BIND10_LDFLAGS" != "x"; then
break break
fi fi
LDFLAGS="$LDFLAGS_SAVED"
done done
if test "x$BIND10_LDFLAGS" != "x"; then if test "x$BIND10_LDFLAGS" != "x"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
...@@ -117,7 +116,7 @@ AC_SUBST(BIND10_DNS_LIB) ...@@ -117,7 +116,7 @@ AC_SUBST(BIND10_DNS_LIB)
# Restore other flags # Restore other flags
CPPFLAGS="$CPPFLAGS_SAVED" CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVES" LDFLAGS="$LDFLAGS_SAVED"
AC_LANG_RESTORE AC_LANG_RESTORE
])dnl AX_ISC_BIND10 ])dnl AX_ISC_BIND10
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment