diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5f696779d9b..25efcf1e69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-03-31 Jan Djärv <jan.h.d@swipnet.se> + + * configure.ac: Fix errors from previous checkin (GSettings check). + Backport from trunk. + 2014-03-30 Daniel Colascione <dancol@dancol.org> * configure.ac: Include GFILENOTIFY objects in glib check. (Bug#17069) diff --git a/configure.ac b/configure.ac index 971674bb3f2..9074cb2ffe6 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 |