Mercurial > emacs
comparison configure.in @ 106514:d079dad917ed
configure.in: Don't check for RSVG or GConf unless X11 is used.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Wed, 09 Dec 2009 18:46:53 +0000 |
parents | 2400073344ef |
children | 12138f085fa7 |
comparison
equal
deleted
inserted
replaced
106513:ee739656ad20 | 106514:d079dad917ed |
---|---|
1608 fi | 1608 fi |
1609 | 1609 |
1610 | 1610 |
1611 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. | 1611 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. |
1612 HAVE_RSVG=no | 1612 HAVE_RSVG=no |
1613 if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then | 1613 if test "${HAVE_X11}" = "yes"; then |
1614 if test "${with_rsvg}" != "no"; then | 1614 if test "${with_rsvg}" != "no"; then |
1615 RSVG_REQUIRED=2.11.0 | 1615 RSVG_REQUIRED=2.11.0 |
1616 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" | 1616 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" |
1617 | 1617 |
1618 PKG_CHECK_MODULES(RSVG, $RSVG_MODULE, :, :) | 1618 PKG_CHECK_MODULES(RSVG, $RSVG_MODULE, :, :) |
1754 fi | 1754 fi |
1755 | 1755 |
1756 dnl GConf has been tested under GNU/Linux only. | 1756 dnl GConf has been tested under GNU/Linux only. |
1757 dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6. | 1757 dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6. |
1758 HAVE_GCONF=no | 1758 HAVE_GCONF=no |
1759 if test "X$with_x" != "Xno" && test "${with_gconf}" = "yes"; then | 1759 if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then |
1760 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no) | 1760 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no) |
1761 if test "$HAVE_GCONF" = yes; then | 1761 if test "$HAVE_GCONF" = yes; then |
1762 AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.]) | 1762 AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.]) |
1763 fi | 1763 fi |
1764 fi | 1764 fi |