[libxml2] Revert the use of SAVE_LDFLAGS in configure.ac
- From: Daniel Veillard <veillard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Revert the use of SAVE_LDFLAGS in configure.ac
- Date: Mon, 23 May 2016 06:02:05 +0000 (UTC)
commit ebbd2b725fb206c3fede36c1366931088f89f462
Author: Mattias Hansson <mattihn axis com>
Date: Mon May 23 13:58:24 2016 +0800
Revert the use of SAVE_LDFLAGS in configure.ac
For https://bugzilla.gnome.org/show_bug.cgi?id=761252
This reverts commit 7dc24965092d7cc310908d6052913050e88ec072.
configure.ac | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index af8ec25..03302d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]