Mercurial > emacs
changeset 92515:b104e440c950
Regenerate.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 05 Mar 2008 20:03:20 +0000 |
| parents | 66d896123af5 |
| children | f55e900180a0 |
| files | configure |
| diffstat | 1 files changed, 50 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Mar 05 20:02:58 2008 +0000 +++ b/configure Wed Mar 05 20:03:20 2008 +0000 @@ -12390,27 +12390,25 @@ CFLAGS=$late_CFLAGS fi -#### For font-backend -if test "${USE_FONT_BACKEND}" != "no"; then - +### Start of font-backend section. +if test "${HAVE_X11}" != "yes"; then + USE_FONT_BACKEND=no +fi + +if test "${USE_FONT_BACKEND}" = "yes"; then cat >>confdefs.h <<\_ACEOF #define USE_FONT_BACKEND 1 _ACEOF -### Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. -HAVE_XFT=maybe -if test "${HAVE_X11}" = "yes"; then + ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. + HAVE_XFT=maybe if test "x${with_freetype}" = "xno"; then with_xft="no"; fi if test "x${with_xft}" != "xno"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi - succeeded=no @@ -12719,23 +12717,20 @@ CPPFLAGS="$OLD_CPPFLAGS" CFLAGS="$OLD_CFLAGS" LIBS="$OLD_LIBS" - fi - fi - fi -fi -if test "$HAVE_XFT" != "yes"; then - HAVE_XFT=no -fi - - -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 - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi + fi # "${HAVE_XFT}" = "yes" + fi # "$HAVE_XFT" != no + fi # "x${with_xft}" != "xno" + + if test "$HAVE_XFT" != "yes"; then + HAVE_XFT=no + fi + + + 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 succeeded=no @@ -12831,7 +12826,7 @@ HAVE_FREETYPE=no fi - if test "${HAVE_FREETYPE}" = "yes"; then + if test "${HAVE_FREETYPE}" = "yes"; then succeeded=no @@ -12926,23 +12921,20 @@ HAVE_FC=no fi - if test "${HAVE_FC}" = "no"; then - HAVE_FREETYPE=no + if test "${HAVE_FC}" = "no"; then + HAVE_FREETYPE=no + fi fi fi -fi - -HAVE_LIBOTF=no -if test "${HAVE_FREETYPE}" = "yes"; then + + HAVE_LIBOTF=no + if test "${HAVE_FREETYPE}" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_FREETYPE 1 _ACEOF - if test "${with_libotf}" != "no"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi + if test "${with_libotf}" != "no"; then succeeded=no @@ -13037,21 +13029,18 @@ HAVE_LIBOTF=no fi - if test "$HAVE_LIBOTF" = "yes"; then + if test "$HAVE_LIBOTF" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBOTF 1 _ACEOF + fi fi fi -fi - -HAVE_M17N_FLT=no -if test "${with_m17n_flt}" != "no"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi + + HAVE_M17N_FLT=no + if test "${with_m17n_flt}" != "no"; then succeeded=no @@ -13146,26 +13135,26 @@ HAVE_M17N_FLT=no fi - if test "$HAVE_M17N_FLT" = "yes"; then + if test "$HAVE_M17N_FLT" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_M17N_FLT 1 _ACEOF - fi -fi - - - - - - - - - - -fi -#### End for font-backend + fi + fi + + + + + + + + + + +fi # "${USE_FONT_BACKEND}" = "yes" +### End of font-backend section. ### Use -lXpm if available, unless `--with-xpm=no'. HAVE_XPM=no