[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure,v |
Date: |
Wed, 05 Mar 2008 20:03:22 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/05 20:03:22
Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- configure 5 Mar 2008 03:54:04 -0000 1.258
+++ configure 5 Mar 2008 20:03:20 -0000 1.259
@@ -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
+ fi # "${HAVE_XFT}" = "yes"
+ fi # "$HAVE_XFT" != no
+ fi # "x${with_xft}" != "xno"
+
+ if test "$HAVE_XFT" != "yes"; then
HAVE_XFT=no
-fi
+ fi
-HAVE_FREETYPE=no
-### Use -lfreetype if available, unless `--with-freetype=no'.
-if test "${HAVE_XFT}" = "yes"; then
+ 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
+ elif test "x${with_freetype}" != "xno"; then
succeeded=no
@@ -12930,19 +12925,16 @@
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
succeeded=no
@@ -13045,14 +13037,11 @@
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
# Extract the first word of "pkg-config", so it can be a program name with
args.
@@ -13153,7 +13142,7 @@
_ACEOF
fi
-fi
+ fi
@@ -13164,8 +13153,8 @@
-fi
-#### End for font-backend
+fi # "${USE_FONT_BACKEND}" = "yes"
+### End of font-backend section.
### Use -lXpm if available, unless `--with-xpm=no'.
HAVE_XPM=no