shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-09 04:58:16 +03:00
Code

Revert the use of SAVE_LDFLAGS in configure.ac

Browse Source 
For https://bugzilla.gnome.org/show_bug.cgi?id=761252

This reverts commit 7dc24965092d7cc310908d6052913050e88ec072.
This commit is contained in:
Mattias Hansson 2016-05-23 13:58:24 +08:00 committed by Daniel Veillard
parent c97750d11b
commit ebbd2b725f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -399,10 +399,6 @@ else
if test "x$have_libz" = "xno"; then
AC_CHECK_HEADERS(zlib.h,
[SAVE_LDFLAGS="${LDFLAGS}"
if test "x${Z_DIR}" != "x"; then
LDFLAGS="${LDFLAGS} -L${Z_DIR}/lib"
fi
AC_CHECK_LIB(z, gzread,[
have_libz=yes
if test "x${Z_DIR}" != "x"; then
@ -417,7 +413,7 @@ else
Z_LIBS="-lz"
fi],
[have_libz=no])
LDFLAGS="${SAVE_LDFLAGS}"])
)
else
# we still need to check for zlib.h header
AC_CHECK_HEADERS([zlib.h])
@ -453,8 +449,6 @@ else
# private dependencies, though, so static linking may fail.
if test "x$have_liblzma" = "xno"; then
AC_CHECK_HEADERS(lzma.h,
[SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="-L${LZMA_DIR}/lib"
AC_CHECK_LIB(lzma, lzma_code,[
have_liblzma=yes
if test "x${LZMA_DIR}" != "x"; then
@ -464,7 +458,7 @@ else
LZMA_LIBS="-llzma"
fi],
[have_liblzma=no])
LDFLAGS="${SAVE_LDFLAGS}"])
)
else
# we still need to check for lzma,h header
AC_CHECK_HEADERS([lzma.h])