diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-start.el | 2 |
5 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2009-11-21 Jan Djärv <[email protected]> + + * configure.in: Don't check for GConf unless X is used. + 2009-11-20 Dan Nicolaescu <[email protected]> * configure.in: Use -Wdeclaration-after-statement if available. @@ -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 a4abbe04d2..98e39cc007 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 00454ff7fd..9b95a93e45 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-11-21 Jan Djärv <[email protected]> + + * cus-start.el (all): Add native condition for font-use-system-font. + 2009-11-21 Nathaniel Flath <[email protected]> * progmodes/cc-menus.el (cc-imenu-java-generic-expression): A diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 76acd7e92c..014e75bf6e 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! |