Don't need to explicitly check for xft.
This commit is contained in:
Mikael Magnusson
parent
73adc6480d
commit
661a53cb68
3 changed files with 0 additions and 157 deletions
|
|
@ -46,7 +46,6 @@ nodist_bin_SCRIPTS = \
|
|||
|
||||
render_rendertest_CPPFLAGS = \
|
||||
$(PANGO_CFLAGS) \
|
||||
$(XFT_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\"RenderTest\"
|
||||
render_rendertest_LDADD = \
|
||||
|
|
@ -54,7 +53,6 @@ render_rendertest_LDADD = \
|
|||
render/libobrender.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(PANGO_LIBS) \
|
||||
$(XFT_LIBS) \
|
||||
$(XML_LIBS) \
|
||||
$(X_LIBS)
|
||||
render_rendertest_SOURCES = render/test.c
|
||||
|
|
@ -64,7 +62,6 @@ render_libobrender_la_CPPFLAGS = \
|
|||
$(GLIB_CFLAGS) \
|
||||
$(XML_CFLAGS) \
|
||||
$(PANGO_CFLAGS) \
|
||||
$(XFT_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\"ObRender\" \
|
||||
-DDEFAULT_THEME=\"$(theme)\"
|
||||
render_libobrender_la_LDFLAGS = \
|
||||
|
|
@ -73,7 +70,6 @@ render_libobrender_la_LIBADD = \
|
|||
obt/libobt.la \
|
||||
$(X_LIBS) \
|
||||
$(PANGO_LIBS) \
|
||||
$(XFT_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(XML_LIBS)
|
||||
render_libobrender_la_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -102,10 +102,6 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0])
|
|||
AC_SUBST(PANGO_CFLAGS)
|
||||
AC_SUBST(PANGO_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(XFT, [xft])
|
||||
AC_SUBST(XFT_CFLAGS)
|
||||
AC_SUBST(XFT_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
|
||||
AC_SUBST(XML_CFLAGS)
|
||||
AC_SUBST(XML_LIBS)
|
||||
|
|
|
|||
149
m4/x11.m4
149
m4/x11.m4
|
|
@ -29,155 +29,6 @@ AC_DEFUN([X11_DEVEL],
|
|||
CPPFLAGS=$OLDCPPFLAGS
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([XFT_ERROR],
|
||||
[
|
||||
if test "$XFT_MIN"; then
|
||||
AC_MSG_ERROR([$PACKAGE requires the Xft font library >= $XFT_MIN.
|
||||
See http://www.fontconfig.org/
|
||||
])
|
||||
else
|
||||
AC_MSG_ERROR([$PACKAGE requires the Xft font library.
|
||||
See http://www.fontconfig.org/
|
||||
])
|
||||
fi
|
||||
])
|
||||
|
||||
# XFT_DEVEL([required-version])
|
||||
#
|
||||
# Check for the XFT development package.
|
||||
# You can use the optional argument to check for a library of at least the
|
||||
# given version.
|
||||
# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) output variables.
|
||||
AC_DEFUN([XFT_DEVEL],
|
||||
[
|
||||
AC_REQUIRE([X11_DEVEL])
|
||||
|
||||
if test "$1"; then
|
||||
XFT_MIN="$1"
|
||||
XFT_MIN_MAJOR=${XFT_MIN%.*.*}
|
||||
XFT_MIN_MINOR=${XFT_MIN%.*}
|
||||
XFT_MIN_MINOR=${XFT_MIN_MINOR#*.}
|
||||
XFT_MIN_REVISION=${XFT_MIN#*.*.}
|
||||
XFT_MIN="$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION"
|
||||
else
|
||||
XFT_MIN=""
|
||||
fi
|
||||
|
||||
if test -z "$XFT_MIN"; then
|
||||
AC_MSG_CHECKING([for Xft])
|
||||
if ! pkg-config xft; then
|
||||
AC_MSG_RESULT([no])
|
||||
XFT_ERROR
|
||||
fi
|
||||
else
|
||||
AC_MSG_CHECKING([for Xft version >= $XFT_MIN])
|
||||
if ! pkg-config --atleast-version $XFT_MIN xft; then
|
||||
AC_MSG_RESULT([no])
|
||||
XFT_ERROR
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
|
||||
# Store these
|
||||
OLDLIBS=$LIBS
|
||||
OLDCPPFLAGS=$CPPFLAGS
|
||||
|
||||
XFT_CFLAGS="`pkg-config --cflags xft`"
|
||||
XFT_LIBS="`pkg-config --libs xft`"
|
||||
|
||||
# Set these for checking with the tests below. They'll be restored after
|
||||
LIBS="$LIBS $XFT_LIBS"
|
||||
CPPFLAGS="$XFT_CFLAGS $CPPFLAGS"
|
||||
|
||||
AC_CHECK_LIB([Xft], [XftGetVersion], # this was not defined in < 2.0
|
||||
if test "$XFT_MIN"; then
|
||||
AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN])
|
||||
AC_TRY_COMPILE(
|
||||
[
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
],
|
||||
[
|
||||
#if !defined(XFT_MAJOR)
|
||||
# error Xft.h is too old
|
||||
#endif
|
||||
#if XFT_MAJOR < $XFT_MIN_MAJOR
|
||||
# error Xft.h is too old
|
||||
#endif
|
||||
#if XFT_MAJOR == $XFT_MIN_MAJOR
|
||||
# if XFT_MINOR < $XFT_MIN_MINOR
|
||||
# error Xft.h is too old
|
||||
# endif
|
||||
#endif
|
||||
#if XFT_MAJOR == $XFT_MIN_MAJOR
|
||||
# if XFT_MAJOR == $XFT_MIN_MINOR
|
||||
# if XFT_REVISION < $XFT_MIN_REVISION
|
||||
# error Xft.h is too old
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
int i = XFT_MAJOR;
|
||||
XftFont foo;
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
XFT_ERROR
|
||||
])
|
||||
else
|
||||
AC_MSG_CHECKING([for X11/Xft/Xft.h])
|
||||
AC_TRY_COMPILE(
|
||||
[
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
],
|
||||
[
|
||||
int i = XFT_MAJOR; /* make sure were using Xft 2, not 1 */
|
||||
XftFont foo;
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
XFT_ERROR
|
||||
])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if we can compile with Xft])
|
||||
AC_TRY_LINK(
|
||||
[
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
],
|
||||
[
|
||||
int i = XFT_MAJOR;
|
||||
XftFont foo
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
],
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([Unable to compile with the Xft font library.
|
||||
])
|
||||
])
|
||||
)
|
||||
|
||||
# Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefiles
|
||||
LIBS=$OLDLIBS
|
||||
CPPFLAGS=$OLDCPPFLAGS
|
||||
|
||||
AC_SUBST([XFT_CFLAGS])
|
||||
AC_SUBST([XFT_LIBS])
|
||||
])
|
||||
|
||||
|
||||
# X11_EXT_XKB()
|
||||
#
|
||||
# Check for the presence of the "Xkb" X Window System extension.
|
||||
|
|
|
|||
Loading…
Reference in a new issue