Mercurial > emacs
changeset 97801:dafd1efe2d45
Regenerate.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 28 Aug 2008 20:32:11 +0000 |
| parents | 0d162f4e0e6b |
| children | 48c669cb45f9 |
| files | configure |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Aug 28 20:31:35 2008 +0000 +++ b/configure Thu Aug 28 20:32:11 2008 +0000 @@ -12545,7 +12545,7 @@ ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. HAVE_XFT=maybe -if test "x${with_freetype}" = "xno"; then +if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then with_xft="no"; fi if test "x${with_xft}" != "xno"; then @@ -12871,7 +12871,7 @@ ### Use -lfreetype if available, unless `--with-freetype=no'. if test "${HAVE_XFT}" = "yes"; then HAVE_FREETYPE=yes -elif test "x${with_freetype}" != "xno"; then +elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then succeeded=no