From 62b7c42208db8999b22a2b1effabec3dcbc06e91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Wed, 9 Dec 2009 18:46:53 +0000 Subject: [PATCH] configure.in: Don't check for RSVG or GConf unless X11 is used. --- ChangeLog | 4 ++++ configure | 4 ++-- configure.in | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d864a925b7..f33f84c64c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-12-09 Jan Djärv + + * configure.in: Don't check for RSVG or GConf unless X11 is used. + 2009-12-09 Ken Brown (tiny change) * configure.in: Allow compiling Emacs with GTK on Cygwin. diff --git a/configure b/configure index f3d46f1c06..79dfe0fdbd 100755 --- a/configure +++ b/configure @@ -11327,7 +11327,7 @@ fi ### 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 @@ done 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 --git a/configure.in b/configure.in index 42cc66045f..8320448d85 100644 --- a/configure.in +++ b/configure.in @@ -1610,7 +1610,7 @@ fi ### 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 @@ 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 "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.]) -- 2.20.1