aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2011-07-13 12:36:12 +0200
committerJan Djärv2011-07-13 12:36:12 +0200
commit2ad77c9dd4d29f1df663b27eb41f9257bfb59bfb (patch)
treec089f56afce3b51510c898186a7df93ad15a5cec
parenta1c9f41b785b5978ffa9c9b65c92b3bbc3350a2b (diff)
downloademacs-2ad77c9dd4d29f1df663b27eb41f9257bfb59bfb.tar.gz
emacs-2ad77c9dd4d29f1df663b27eb41f9257bfb59bfb.zip
* configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf4e63d985a..f9cadda71aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-07-13 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.
4
12011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin 7 * configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin
diff --git a/configure.in b/configure.in
index 40a34286f00..f88506fbb2e 100644
--- a/configure.in
+++ b/configure.in
@@ -1987,7 +1987,7 @@ AC_SUBST(DBUS_OBJ)
1987dnl GSettings has been tested under GNU/Linux only. 1987dnl GSettings has been tested under GNU/Linux only.
1988HAVE_GSETTINGS=no 1988HAVE_GSETTINGS=no
1989if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then 1989if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
1990 PKG_CHECK_MODULES(GSETTINGS, glib-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) 1990 PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
1991 if test "$HAVE_GSETTINGS" = "yes"; then 1991 if test "$HAVE_GSETTINGS" = "yes"; then
1992 AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) 1992 AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
1993 SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" 1993 SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"