diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-10-24 21:03:56 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-10-24 21:03:56 +0000 |
| commit | a5962dda126e7e48f51c276f907a1fbb76b8ed4d (patch) | |
| tree | 5556e3e9fc278ac43352572bccdb24df72e64d10 | |
| parent | df85d34dd3a85a3629caa2732729ae26f268d5d0 (diff) | |
Allow building without xrender.pc, by using AC_PATH_XTRA. Bump to 1.0.3.RENDERCHECK-1_0_3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2004-10-24: + Version 1.0.3 released. + Allows building on systems without xrender.pc + 2004-09-19: Version 1.0.2 released. Adds a transformed coordinates test. diff --git a/configure.ac b/configure.ac index 510b31b..a76131f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([rendercheck], - 1.0.2, + 1.0.3, [anholt@FreeBSD.org], rendercheck) @@ -18,7 +18,22 @@ AM_MAINTAINER_MODE AC_PROG_CC # Checks for pkg-config packages -PKG_CHECK_MODULES(RC, xrender) +PKG_CHECK_MODULES(RC, xrender, + [xrender_found_with_pkgconfig=yes], + [xrender_found_with_pkgconfig=no]) + +if test "$xrender_found_with_pkgconfig" = "no" +then + AC_PATH_XTRA + if test "x$no_x" = "xyes" + then + AC_MSG_ERROR([X is required, but it was either disabled or not found.]) + fi + + RC_CFLAGS="$X_CFLAGS" + RC_LIBS="$X_LIBS -lXrender -lXext -lX11" +fi + AC_SUBST(RC_CFLAGS) AC_SUBST(RC_LIBS) |