diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-21 15:40:24 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-21 15:40:24 +0000 |
commit | 86d58805776e8c56d0091db00a803bc7ce5e2aa6 (patch) | |
tree | 4375fb75d9b4f1b770ac8e63da19bb67f4839b0b /configure.in | |
parent | c49e8bcaf4f61b4d3e40b4e7c71e41ece98d7998 (diff) | |
download | emacs-86d58805776e8c56d0091db00a803bc7ce5e2aa6.tar.gz |
* cus-start.el (all): Add native condition for font-use-system-font.
* configure.in: Don't check for GConf unless X is used.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index a4abbe04d29..98e39cc007d 100644 --- a/configure.in +++ b/configure.in @@ -1756,7 +1756,7 @@ fi dnl GConf has been tested under GNU/Linux only. dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6. HAVE_GCONF=no -if test "${with_gconf}" = "yes"; then +if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no) if test "$HAVE_GCONF" = yes; then AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.]) |