diff options
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 60855e20b..5010a7d79 100644 --- a/configure.ac +++ b/configure.ac @@ -451,7 +451,26 @@ dnl --------------------------------------------- dnl Checks for X11 dnl --------------------------------------------- -AC_PATH_XTRA +if test "x$with_x" != "xno"; then + PKG_CHECK_MODULES([X11], [x11], , [ + AC_PATH_XTRA + + dnl ---------------------------------------------- + dnl Check for XShm support (required with X) + dnl ---------------------------------------------- + + if test x"$no_x" != "xyes"; then + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XShm.h], [], + [AC_MSG_ERROR([XShm extension is required])]) + CPPFLAGS="$ac_save_CPPFLAGS" + fi + ]) +else + no_x="yes" +fi + if test x"$no_x" != "xyes"; then AC_DEFINE(HAVE_X11,1,[Define this if you have X11R6 installed]) fi @@ -592,18 +611,6 @@ fi AM_CONDITIONAL(HAVE_V4L, [test x"$have_v4l" = "xyes"]) dnl ---------------------------------------------- -dnl Check for XShm support (required with X) -dnl ---------------------------------------------- - -if test x"$no_x" != "xyes"; then - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/XShm.h], [], - [AC_MSG_ERROR([XShm extension is required])]) - CPPFLAGS="$ac_save_CPPFLAGS" -fi - -dnl ---------------------------------------------- dnl Check for Xv and XvMC support dnl ---------------------------------------------- |