* configure.in (HAVE_XFT, HAVE_FREETYPE, HAVE_LIBOTF)
(HAVE_M17N_FLT): Don't check for these unless HAVE_X11.
This commit is contained in:
Adrian Robert
parent
3dc847a379
commit
c21273df00
2 changed files with 90 additions and 75 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2009-02-23 Adrian Robert <Adrian.B.Robert@gmail.com>
|
||||
|
||||
* configure.in (HAVE_XFT, HAVE_FREETYPE, HAVE_LIBOTF)
|
||||
(HAVE_M17N_FLT): Don't check for these unless HAVE_X11.
|
||||
|
||||
2009-02-04 Adrian Robert <Adrian.B.Robert@gmail.com>
|
||||
|
||||
* configure.in (COCOA_EXPERIMENTAL_CTRL_G): Drop.
|
||||
|
|
|
|||
160
configure.in
160
configure.in
|
|
@ -1824,90 +1824,102 @@ either XPointer or XPointer*.])dnl
|
|||
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
|
||||
with_xft="no";
|
||||
fi
|
||||
if test "x${with_xft}" != "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
|
||||
|
||||
PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
|
||||
if test "$HAVE_XFT" != no; then
|
||||
OLD_CPPFLAGS="$CPPFLAGS"
|
||||
OLD_CFLAGS="$CFLAGS"
|
||||
OLD_LIBS="$LIBS"
|
||||
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
|
||||
CFLAGS="$CFLAGS $XFT_CFLAGS"
|
||||
LIBS="$XFT_LIBS $LIBS"
|
||||
AC_CHECK_HEADER(X11/Xft/Xft.h,
|
||||
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
|
||||
PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
|
||||
if test "$HAVE_XFT" != no; then
|
||||
OLD_CPPFLAGS="$CPPFLAGS"
|
||||
OLD_CFLAGS="$CFLAGS"
|
||||
OLD_LIBS="$LIBS"
|
||||
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
|
||||
CFLAGS="$CFLAGS $XFT_CFLAGS"
|
||||
LIBS="$XFT_LIBS $LIBS"
|
||||
AC_CHECK_HEADER(X11/Xft/Xft.h,
|
||||
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
|
||||
|
||||
if test "${HAVE_XFT}" = "yes"; then
|
||||
AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
|
||||
AC_SUBST(XFT_LIBS)
|
||||
C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
|
||||
else
|
||||
CPPFLAGS="$OLD_CPPFLAGS"
|
||||
CFLAGS="$OLD_CFLAGS"
|
||||
LIBS="$OLD_LIBS"
|
||||
fi # "${HAVE_XFT}" = "yes"
|
||||
fi # "$HAVE_XFT" != no
|
||||
fi # "x${with_xft}" != "xno"
|
||||
|
||||
dnl For the "Does Emacs use" message at the end.
|
||||
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
|
||||
AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
|
||||
AC_SUBST(XFT_LIBS)
|
||||
C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
|
||||
else
|
||||
CPPFLAGS="$OLD_CPPFLAGS"
|
||||
CFLAGS="$OLD_CFLAGS"
|
||||
LIBS="$OLD_LIBS"
|
||||
fi # "${HAVE_XFT}" = "yes"
|
||||
fi # "$HAVE_XFT" != no
|
||||
fi # "x${with_xft}" != "xno"
|
||||
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
|
||||
|
||||
dnl For the "Does Emacs use" message at the end.
|
||||
if test "$HAVE_XFT" != "yes"; then
|
||||
HAVE_XFT=no
|
||||
fi
|
||||
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
|
||||
fi
|
||||
|
||||
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
|
||||
PKG_CHECK_MODULES(LIBOTF, libotf, HAVE_LIBOTF=yes,
|
||||
HAVE_LIBOTF=no)
|
||||
if test "$HAVE_LIBOTF" = "yes"; then
|
||||
AC_DEFINE(HAVE_LIBOTF, 1, [Define to 1 if using libotf.])
|
||||
AC_CHECK_LIB(otf, OTF_get_variation_glyphs,
|
||||
HAVE_OTF_GET_VARIATION_GLYPHS=yes,
|
||||
HAVE_OTF_GET_VARIATION_GLYPHS=no)
|
||||
if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
|
||||
AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
|
||||
[Define to 1 if libotf has OTF_get_variation_glyphs.])
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
|
||||
fi
|
||||
|
||||
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
|
||||
PKG_CHECK_MODULES(LIBOTF, libotf, HAVE_LIBOTF=yes,
|
||||
HAVE_LIBOTF=no)
|
||||
if test "$HAVE_LIBOTF" = "yes"; then
|
||||
AC_DEFINE(HAVE_LIBOTF, 1, [Define to 1 if using libotf.])
|
||||
AC_CHECK_LIB(otf, OTF_get_variation_glyphs,
|
||||
HAVE_OTF_GET_VARIATION_GLYPHS=yes,
|
||||
HAVE_OTF_GET_VARIATION_GLYPHS=no)
|
||||
if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
|
||||
AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
|
||||
[Define to 1 if libotf has OTF_get_variation_glyphs.])
|
||||
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
|
||||
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
|
||||
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
|
||||
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(LIBOTF_LIBS)
|
|||
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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue