diff options
| author | Chong Yidong | 2008-08-28 20:32:11 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-08-28 20:32:11 +0000 |
| commit | 392b3c3ab604eabb611bacd8b3ccdc665fc80cf7 (patch) | |
| tree | 89dbd612f4d6546c3462f024f2cb0e76637085e4 | |
| parent | a8c95f1af2019bbfdc0e4adde7967d298744bb8a (diff) | |
| download | emacs-392b3c3ab604eabb611bacd8b3ccdc665fc80cf7.tar.gz emacs-392b3c3ab604eabb611bacd8b3ccdc665fc80cf7.zip | |
Regenerate.
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -12545,7 +12545,7 @@ fi | |||
| 12545 | 12545 | ||
| 12546 | ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. | 12546 | ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. |
| 12547 | HAVE_XFT=maybe | 12547 | HAVE_XFT=maybe |
| 12548 | if test "x${with_freetype}" = "xno"; then | 12548 | if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then |
| 12549 | with_xft="no"; | 12549 | with_xft="no"; |
| 12550 | fi | 12550 | fi |
| 12551 | if test "x${with_xft}" != "xno"; then | 12551 | if test "x${with_xft}" != "xno"; then |
| @@ -12871,7 +12871,7 @@ HAVE_FREETYPE=no | |||
| 12871 | ### Use -lfreetype if available, unless `--with-freetype=no'. | 12871 | ### Use -lfreetype if available, unless `--with-freetype=no'. |
| 12872 | if test "${HAVE_XFT}" = "yes"; then | 12872 | if test "${HAVE_XFT}" = "yes"; then |
| 12873 | HAVE_FREETYPE=yes | 12873 | HAVE_FREETYPE=yes |
| 12874 | elif test "x${with_freetype}" != "xno"; then | 12874 | elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then |
| 12875 | 12875 | ||
| 12876 | 12876 | ||
| 12877 | succeeded=no | 12877 | succeeded=no |