diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-08 20:22:47 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-08 20:22:47 +0000 |
| commit | 9c36643810a7e837f325970ddd5964bbff4971b6 (patch) | |
| tree | 37b57c634aa96c3ad7d4e751794395ca7ea7ce55 | |
| parent | 73b3dff9d12d417716c19a33a95eac5f73e5da13 (diff) | |
| download | xorg-lib-libXrandr-9c36643810a7e837f325970ddd5964bbff4971b6.tar.gz | |
- Don't search for non-autoconf'ed X libs in Xrandr
- Rename man page Xrandr.3
| -rw-r--r-- | configure.ac | 40 | ||||
| -rw-r--r-- | man/Makefile.am | 2 |
2 files changed, 3 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 0ab00f9..7236abc 100644 --- a/configure.ac +++ b/configure.ac @@ -44,49 +44,13 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) +PKG_CHECK_MODULES(X, x11) -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - # Check randr configuration, strip extra digits from package version to # find the required protocol version RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(RANDR, randr >= $RANDR_VERSION xext xrender render) +PKG_CHECK_MODULES(RANDR, randrproto >= $RANDR_VERSION xext xrender render) AC_OUTPUT([Makefile src/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index 7126612..90511c0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,3 +1,3 @@ -man3_MANS = Xrandr.man +man3_MANS = Xrandr.3 EXTRA_DIST = $(man3_MANS) |