Commit dcb4c4d7 authored by Jan Djärv's avatar Jan Djärv

* configure.ac: Fix errors from previous checkin (GSettings check).

Backport from trunk.
parent 8e86e380
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> 2014-03-30 Daniel Colascione <dancol@dancol.org>
* configure.ac: Include GFILENOTIFY objects in glib check. (Bug#17069) * configure.ac: Include GFILENOTIFY objects in glib check. (Bug#17069)
......
...@@ -2432,6 +2432,10 @@ HAVE_GSETTINGS=no ...@@ -2432,6 +2432,10 @@ HAVE_GSETTINGS=no
if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then 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) PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
if test "$HAVE_GSETTINGS" = "yes"; then 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]) AC_MSG_CHECKING([whether GSettings is in gio])
GSETTINGS_COMPILES=no GSETTINGS_COMPILES=no
AC_LINK_IFELSE( AC_LINK_IFELSE(
...@@ -2447,11 +2451,13 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then ...@@ -2447,11 +2451,13 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
[GSETTINGS_COMPILES=yes]) [GSETTINGS_COMPILES=yes])
AC_MSG_RESULT([$GSETTINGS_COMPILES]) 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.]) AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
SETTINGS_LIBS="$GSETTINGS_LIBS" SETTINGS_LIBS="$GSETTINGS_LIBS"
fi fi
CFLAGS=$old_CFLAGS
LIBS=$old_LIBS
fi fi
fi fi
......
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