Commit 62d44fe6 authored by Marcus Meissner's avatar Marcus Meissner Committed by Carlos Garnacho

configure: Save LDFLAGS

There's places where CFLAGS is modified/restored while LDFLAGS is left
untouched, both should be saved/restored at the same time.

https://bugzilla.gnome.org/show_bug.cgi?id=742186
parent 6a1dd9ca
......@@ -2094,8 +2094,10 @@ AM_CONDITIONAL(HAVE_LIBOSINFO, test "x$have_libosinfo" = "xyes")
# distros, it is not.
OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LDFLAGS=""
LIBS=""
AC_ARG_ENABLE(libgif,
......@@ -2132,6 +2134,7 @@ fi
AM_CONDITIONAL(HAVE_LIBGIF, test "x$have_libgif" = "xyes")
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
##################################################################
......@@ -2142,8 +2145,10 @@ LIBS="$OLD_LIBS"
# distros, it is not.
OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LDFLAGS=""
LIBS=""
AC_ARG_ENABLE(libjpeg,
......@@ -2180,6 +2185,7 @@ fi
AM_CONDITIONAL(HAVE_LIBJPEG, test "x$have_libjpeg" = "xyes")
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
##################################################################
......@@ -2190,8 +2196,10 @@ LIBS="$OLD_LIBS"
# distros, it is not.
OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LDFLAGS=""
LIBS=""
AC_ARG_ENABLE(libtiff,
......@@ -2228,6 +2236,7 @@ fi
AM_CONDITIONAL(HAVE_LIBTIFF, test "x$have_libtiff" = "xyes")
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
##################################################################
......@@ -2238,8 +2247,10 @@ LIBS="$OLD_LIBS"
# distros, it is not.
OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
LDFLAGS=""
LIBS=""
AC_ARG_ENABLE(libpng,
......@@ -2276,6 +2287,7 @@ fi
AM_CONDITIONAL(HAVE_LIBPNG, test "x$have_libpng" = "xyes")
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
##################################################################
......
......@@ -3,8 +3,10 @@ AC_DEFUN([AX_SQLITE_BUILTIN_FTS4],
AC_REQUIRE([AC_PROG_CC])
OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS="$SQLITE3_CFLAGS"
LDFLAGS="$SQLITE3_LDFLAGS"
LIBS="$SQLITE3_LIBS"
AC_CHECK_HEADERS([sqlite3.h])
......@@ -27,6 +29,7 @@ AC_DEFUN([AX_SQLITE_BUILTIN_FTS4],
[ax_cv_sqlite_builtin_fts4=no])])
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
])
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