From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 21 Nov 2009 15:40:24 +0000 (+0000)
Subject: * cus-start.el (all): Add native condition for font-use-system-font.
X-Git-Tag: emacs-pretest-23.1.90~279
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b571bf3080b3a15870a4992e7c06500661b38e0;p=emacs.git

* cus-start.el (all): Add native condition for font-use-system-font.

* configure.in: Don't check for GConf unless X is used.
---

diff --git a/ChangeLog b/ChangeLog
index 4e213edee13..eb2d87e29b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.in: Don't check for GConf unless X is used.
+
 2009-11-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* configure.in: Use -Wdeclaration-after-statement if available.
diff --git a/configure b/configure
index c698db5e762..f568df05b9e 100755
--- a/configure
+++ b/configure
@@ -12588,7 +12588,7 @@ done
 fi
 
 HAVE_GCONF=no
-if test "${with_gconf}" = "yes"; then
+if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
 
   succeeded=no
 
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.])
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00454ff7fdf..9b95a93e451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* cus-start.el (all): Add native condition for font-use-system-font.
+
 2009-11-21  Nathaniel Flath  <flat0103@gmail.com>
 
 	* progmodes/cc-menus.el (cc-imenu-java-generic-expression): A
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 76acd7e92cb..014e75bf6e3 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -397,6 +397,8 @@ since it could result in memory overflow and make Emacs crash."
 		       (fboundp 'x-selection-exists-p))
 		      ((string-match "fringe" (symbol-name symbol))
 		       (fboundp 'define-fringe-bitmap))
+		      ((equal "font-use-system-font" (symbol-name symbol))
+		       (featurep 'system-font-setting))
 		      (t t))))
     (if (not (boundp symbol))
 	;; If variables are removed from C code, give an error here!