diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2014-08-10 17:30:18 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2014-08-10 17:30:18 +0100 |
| commit | f7d6087d53944a56906ad5240bf9abe2f0146c4f (patch) | |
| tree | b112d6694f91d3a5cbd24f584bd9818f84027609 /configure.ac | |
| parent | d960a25a19025c76f2b79928c7437c5b112bf9cb (diff) | |
configure: use pkg-config to detect x11 and xv libs
AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE.
https://bugzilla.gnome.org/show_bug.cgi?id=731047
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index b314acc30..50e949309 100644 --- a/configure.ac +++ b/configure.ac @@ -542,34 +542,30 @@ dnl *** X11 *** translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) AG_GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesink], [ - AG_GST_CHECK_X + AG_GST_PKG_CHECK_MODULES(X, x11) ]) dnl Check for Xv extension translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true) AG_GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], [xvimagesink], [ - AG_GST_CHECK_XV + AG_GST_PKG_CHECK_MODULES(XVIDEO, x11 xv) ]) dnl check for X Shm translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true) -AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], , [ +AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [ ], [ if test x$HAVE_X = xyes; then - AC_CHECK_LIB(Xext, XShmAttach, - HAVE_XSHM="yes", HAVE_XSHM="no", - $X_LIBS) - if test "x$HAVE_XSHM" = "xyes"; then - XSHM_LIBS="-lXext" - else - dnl On AIX, it is in XextSam instead, but we still need -lXext - AC_CHECK_LIB(XextSam, XShmAttach, - HAVE_XSHM="yes", HAVE_XSHM="no", - $X_LIBS) - if test "x$HAVE_XSHM" = "xyes"; then - XSHM_LIBS="-lXext -lXextSam" - fi - fi + PKG_CHECK_MODULES(XSHM, xext, [ + AC_CHECK_LIB(Xext, XShmAttach, [ + HAVE_XSHM="yes" + ], [ + HAVE_XSHM="no" + XSHM_LIBS="" + ], [ $X_LIBS ]) + ], [ + HAVE_XSHM="no" + ]) fi ], , [ AC_SUBST(HAVE_XSHM) |