# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1260384413 0
# Node ID d079dad917ed6a9242a0fe12fb8819e403b6d9de
# Parent  ee739656ad2056e996c56c5197c985555f412c55
configure.in: Don't check for RSVG or GConf unless X11 is used.

diff -r ee739656ad20 -r d079dad917ed ChangeLog
--- a/ChangeLog	Wed Dec 09 14:30:37 2009 +0000
+++ b/ChangeLog	Wed Dec 09 18:46:53 2009 +0000
@@ -1,3 +1,7 @@
+2009-12-09  Jan DjƤrv  <jan.h.d@swipnet.se>
+
+	* configure.in: Don't check for RSVG or GConf unless X11 is used.
+
 2009-12-09  Ken Brown  <kbrown@cornell.edu>  (tiny change)
 
 	* configure.in: Allow compiling Emacs with GTK on Cygwin.
diff -r ee739656ad20 -r d079dad917ed configure
--- a/configure	Wed Dec 09 14:30:37 2009 +0000
+++ b/configure	Wed Dec 09 18:46:53 2009 +0000
@@ -11327,7 +11327,7 @@
 
 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
 HAVE_RSVG=no
-if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
+if test "${HAVE_X11}" = "yes"; then
   if test "${with_rsvg}" != "no"; then
     RSVG_REQUIRED=2.11.0
     RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
@@ -12588,7 +12588,7 @@
 fi
 
 HAVE_GCONF=no
-if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
+if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
 
   succeeded=no
 
diff -r ee739656ad20 -r d079dad917ed configure.in
--- a/configure.in	Wed Dec 09 14:30:37 2009 +0000
+++ b/configure.in	Wed Dec 09 18:46:53 2009 +0000
@@ -1610,7 +1610,7 @@
 
 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
 HAVE_RSVG=no
-if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then
+if test "${HAVE_X11}" = "yes"; then
   if test "${with_rsvg}" != "no"; then
     RSVG_REQUIRED=2.11.0
     RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
@@ -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 "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then
+if test "${HAVE_X11}" = "yes" && 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.])