mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 08:20:41 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jan Djärv 2009-12-09 18:46:53 +00:00
parent b87dd91373
commit 62b7c42208
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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.

4
configure vendored
View file

@ -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

4
configure.in
View file

@ -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.])