Mercurial > emacs
changeset 106187:b5eb529d2739
* cus-start.el (all): Add native condition for font-use-system-font.
* configure.in: Don't check for GConf unless X is used.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 21 Nov 2009 15:40:24 +0000 |
| parents | 9b6f45dd8386 |
| children | ac73aedf0825 |
| files | ChangeLog configure configure.in lisp/ChangeLog lisp/cus-start.el |
| diffstat | 5 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Nov 21 15:28:59 2009 +0000 +++ b/ChangeLog Sat Nov 21 15:40:24 2009 +0000 @@ -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.
--- a/configure Sat Nov 21 15:28:59 2009 +0000 +++ b/configure Sat Nov 21 15:40:24 2009 +0000 @@ -12588,7 +12588,7 @@ fi HAVE_GCONF=no -if test "${with_gconf}" = "yes"; then +if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then succeeded=no
--- a/configure.in Sat Nov 21 15:28:59 2009 +0000 +++ b/configure.in Sat Nov 21 15:40:24 2009 +0000 @@ -1756,7 +1756,7 @@ 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.])
--- a/lisp/ChangeLog Sat Nov 21 15:28:59 2009 +0000 +++ b/lisp/ChangeLog Sat Nov 21 15:40:24 2009 +0000 @@ -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
--- a/lisp/cus-start.el Sat Nov 21 15:28:59 2009 +0000 +++ b/lisp/cus-start.el Sat Nov 21 15:40:24 2009 +0000 @@ -397,6 +397,8 @@ (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!