[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs configure.in
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs configure.in |
Date: |
Thu, 26 Feb 2009 21:23:00 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/02/26 21:23:00
Modified files:
. : configure.in
Log message:
* configure.in (HAVE_XFT, HAVE_FREETYPE, HAVE_LIBOTF)
(HAVE_M17N_FLT): Don't check for these unless HAVE_X11.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.586&r2=1.587
Patches:
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -b -r1.586 -r1.587
--- configure.in 26 Feb 2009 01:06:51 -0000 1.586
+++ configure.in 26 Feb 2009 21:23:00 -0000 1.587
@@ -1824,16 +1824,21 @@
CFLAGS=$late_CFLAGS
fi
-### Start of font-backend section.
-PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
-test "${HAVE_FC}" = "no" && with_freetype=no
+### Start of font-backend (under any platform) section.
+# (nothing here yet -- this is a placeholder)
+### End of font-backend (under any platform) section.
+
+### Start of font-backend (under X11) section.
+if test "${HAVE_X11}" = "yes"; then
+ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no)
+ test "${HAVE_FC}" = "no" && with_freetype=no
## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
-HAVE_XFT=maybe
-if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
+ HAVE_XFT=maybe
+ if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
with_xft="no";
-fi
-if test "x${with_xft}" != "xno"; then
+ fi
+ if test "x${with_xft}" != "xno"; then
PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
if test "$HAVE_XFT" != no; then
@@ -1856,29 +1861,29 @@
LIBS="$OLD_LIBS"
fi # "${HAVE_XFT}" = "yes"
fi # "$HAVE_XFT" != no
-fi # "x${with_xft}" != "xno"
+ fi # "x${with_xft}" != "xno"
-dnl For the "Does Emacs use" message at the end.
-if test "$HAVE_XFT" != "yes"; then
+ dnl For the "Does Emacs use" message at the end.
+ 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
dnl As we use Xft, we anyway use freetype.
dnl In this case, there's no need of additional CFLAGS and LIBS.
HAVE_FREETYPE=yes
FONTCONFIG_CFLAGS=
FONTCONFIG_LIBS=
-elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
+ elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
-fi
+ fi
-HAVE_LIBOTF=no
-if test "${HAVE_FREETYPE}" = "yes"; then
+ HAVE_LIBOTF=no
+ if test "${HAVE_FREETYPE}" = "yes"; then
AC_DEFINE(HAVE_FREETYPE, 1,
[Define to 1 if using the freetype and fontconfig libraries.])
if test "${with_libotf}" != "no"; then
@@ -1895,19 +1900,26 @@
fi
fi
fi
-dnl FIXME should there be an error if HAVE_FREETYPE != yes?
-dnl Does the new font backend require it, or can it work without it?
-fi
+ dnl FIXME should there be an error if HAVE_FREETYPE != yes?
+ dnl Does the new font backend require it, or can it work without it?
+ fi
-HAVE_M17N_FLT=no
-if test "${HAVE_LIBOTF}" = yes; then
+ HAVE_M17N_FLT=no
+ if test "${HAVE_LIBOTF}" = yes; then
if test "${with_m17n_flt}" != "no"; then
PKG_CHECK_MODULES(M17N_FLT, m17n-flt, HAVE_M17N_FLT=yes, HAVE_M17N_FLT=no)
if test "$HAVE_M17N_FLT" = "yes"; then
AC_DEFINE(HAVE_M17N_FLT, 1, [Define to 1 if using libm17n-flt.])
fi
fi
+ fi
+else
+ HAVE_XFT=no
+ HAVE_FREETYPE=no
+ HAVE_LIBOTF=no
+ HAVE_M17N_FLT=no
fi
+### End of font-backend (under X11) section.
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
@@ -1918,8 +1930,6 @@
AC_SUBST(M17N_FLT_CFLAGS)
AC_SUBST(M17N_FLT_LIBS)
-### End of font-backend section.
-
### Use -lXpm if available, unless `--with-xpm=no'.
HAVE_XPM=no
if test "${HAVE_X11}" = "yes"; then
- [Emacs-diffs] emacs configure.in,
Adrian Robert <=