diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-14 02:04:30 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-14 02:04:30 -0400 |
| commit | 85c8e939102267d606acb4a0828e02bd38e9449a (patch) | |
| tree | ff5c8b14aa38394edfb9c4a64e6459340b4507e9 | |
| parent | 54cb4d20e4efde08bf6f93f192f7d01c8cd51539 (diff) | |
| download | xine-lib-85c8e939102267d606acb4a0828e02bd38e9449a.tar.gz xine-lib-85c8e939102267d606acb4a0828e02bd38e9449a.tar.bz2 | |
Only check for Xext if X is found via AC_PATH_XTRA
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7acc64305..59d0ab219 100644 --- a/configure.ac +++ b/configure.ac @@ -851,21 +851,21 @@ dnl X_EXTRA_LIBS and X_PRE_LIBS. AC_PATH_XTRA if test x"$no_x" != x"yes"; then X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + AC_CHECK_LIB([Xext], [main], + [X_LIBS="$X_LIBS -lXext"], [AC_MSG_ERROR([libXext is required])], + [$X_LIBS]) elif test x"$have_x" = x"no"; then PKG_CHECK_MODULES([X], [x11 xext], [have_x=yes; no_x=no], [have_x=no; no_x=yes]) fi dnl Check for XShm support (required for xine X support) if test x"$no_x" != x"yes"; then - AC_DEFINE([HAVE_X11], 1, [Define this if you have X11R6 installed]) ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XShm.h], [], [AC_MSG_ERROR([XShm extension is required])], [#include <X11/Xlib.h>]) CPPFLAGS="$ac_save_CPPFLAGS" - AC_CHECK_LIB([Xext], [main], - [X_LIBS="$X_LIBS -lXext"], [AC_MSG_ERROR([libXext is required])], - [$X_LIBS]) + AC_DEFINE([HAVE_X11], 1, [Define this if you have X11R6 installed]) fi AM_CONDITIONAL([HAVE_X11], [test x"$no_x" != x"yes"]) |