Mercurial > emacs
comparison configure @ 97801:dafd1efe2d45
Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 28 Aug 2008 20:32:11 +0000 |
parents | 92ac38fd997e |
children | 29005e3eddab |
comparison
equal
deleted
inserted
replaced
97800:0d162f4e0e6b | 97801:dafd1efe2d45 |
---|---|
12543 | 12543 |
12544 ### Start of font-backend section. | 12544 ### Start of font-backend section. |
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 |
12552 | 12552 |
12553 | 12553 |
12869 | 12869 |
12870 HAVE_FREETYPE=no | 12870 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 |
12878 | 12878 |
12879 # Extract the first word of "pkg-config", so it can be a program name with args. | 12879 # Extract the first word of "pkg-config", so it can be a program name with args. |