diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2008-08-28 20:32:11 +0000 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2008-08-28 20:32:11 +0000 |
commit | 392b3c3ab604eabb611bacd8b3ccdc665fc80cf7 (patch) | |
tree | 89dbd612f4d6546c3462f024f2cb0e76637085e4 /configure | |
parent | a8c95f1af2019bbfdc0e4adde7967d298744bb8a (diff) | |
download | emacs-392b3c3ab604eabb611bacd8b3ccdc665fc80cf7.tar.gz |
Regenerate.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index 438f4751cbf..dd3a49e69ed 100755 --- a/configure +++ b/configure @@ -12545,7 +12545,7 @@ fi ## 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 @@ HAVE_FREETYPE=no ### 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 |