From ce486e0d8f6a6b140187f5a843fe766c3859304b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 31 Mar 2014 07:02:08 +0200 Subject: [PATCH] * configure.ac: Fix errors from previous checkin (GSettings check). --- ChangeLog | 4 ++++ configure.ac | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 00547c36a08..3572267857c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-31 Jan Djärv + + * configure.ac: Fix errors from previous checkin (GSettings check). + 2014-03-29 Jan Djärv * configure.ac: Add check that GSettings is in libgio (Bug#17118). diff --git a/configure.ac b/configure.ac index bf404069a9f..223ff99e849 100644 --- a/configure.ac +++ b/configure.ac @@ -2432,6 +2432,10 @@ HAVE_GSETTINGS=no if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) if test "$HAVE_GSETTINGS" = "yes"; then + old_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $GSETTINGS_CFLAGS" + old_LIBS=$LIBS + LIBS="$LIBS $GSETTINGS_LIBS" AC_MSG_CHECKING([whether GSettings is in gio]) GSETTINGS_COMPILES=no AC_LINK_IFELSE( @@ -2447,11 +2451,13 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then [GSETTINGS_COMPILES=yes]) AC_MSG_RESULT([$GSETTINGS_COMPILES]) - if test "$$GSETTINGS_COMPILES" = "yes"; then + if test "$GSETTINGS_COMPILES" = "yes"; then AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" SETTINGS_LIBS="$GSETTINGS_LIBS" fi + CFLAGS=$old_CFLAGS + LIBS=$old_LIBS fi fi -- 2.39.5