fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 16:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[configure] Check for x11 pkg-config module before using AC_PATH_XTRA

Browse source 
Fixes bug 7491.
This commit is contained in:
Behdad Esfahbod 2006-08-18 17:17:28 -04:00
parent 0c6c0a9e0b
commit 0e78e71443
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
configure.in
View file

@ -94,7 +94,7 @@ dnl cairo_cache_version should be increased every time that the backend
dnl detection stuff changes in a way that removing the config.cache file may be
dnl needed for correct operation.
dnl
m4_define(cairo_cache_version, 2)
m4_define(cairo_cache_version, 3)
dnl ===========================================================================
dnl
@ -220,13 +220,16 @@ CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
dnl ===========================================================================
CAIRO_BACKEND_ENABLE(xlib, Xlib, xlib, XLIB_SURFACE, auto, [
AC_PATH_XTRA
if test "x$no_x" = xyes; then
use_xlib="no (requires Xlib)"
else
xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
fi
xlib_REQUIRES="x11"
PKG_CHECK_MODULES(xlib, $xlib_REQUIRES, ,
[xlib_REQUIRES=""
AC_PATH_XTRA
if test "x$no_x" = xyes; then
use_xlib="no (requires X development libraries)"
else
xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
fi])
])
if test "x$use_xlib" = xyes; then