[Emacs-diffs] emacs ChangeLog configure configure.in

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/12/09 18:46:55

Modified files:
        .              : ChangeLog configure configure.in 

Log message:
        configure.in: Don't check for RSVG or GConf unless X11 is used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.871&r2=1.872
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.338&r2=1.339
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.618&r2=1.619

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/ChangeLog,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -b -r1.871 -r1.872
--- ChangeLog   9 Dec 2009 01:06:32 -0000       1.871
+++ ChangeLog   9 Dec 2009 18:46:53 -0000       1.872
@@ -1,3 +1,7 @@
+2009-12-09  Jan Djärv  <address@hidden>
+
+       * configure.in: Don't check for RSVG or GConf unless X11 is used.
+
 2009-12-09  Ken Brown  <address@hidden>  (tiny change)
 
        * configure.in: Allow compiling Emacs with GTK on Cygwin.

Index: configure
===================================================================
RCS file: /cvsroot/emacs/emacs/configure,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -b -r1.338 -r1.339
--- configure   9 Dec 2009 02:06:16 -0000       1.338
+++ configure   9 Dec 2009 18:46:53 -0000       1.339
@@ -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
 

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -b -r1.618 -r1.619
--- configure.in        9 Dec 2009 02:06:19 -0000       1.618
+++ configure.in        9 Dec 2009 18:46:55 -0000       1.619
@@ -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.])