diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2003-07-15 12:39:39 +0000 |
|---|---|---|
| committer | Brian Cameron <brian.cameron@sun.com> | 2003-07-15 12:39:39 +0000 |
| commit | 57e8b7aba97b3a53ee8365de222ba7ad0e8a6130 (patch) | |
| tree | 7555421f54fac96f730510440e4b3197839d8ca8 /configure.ac | |
| parent | 803a18a70a622322574de4ba53c81a952f0528ab (diff) | |
Now set XVIDEO_LIBS only if the Xv library is found. Fixed matroska check so that it doesn't stop the configure if i...
Original commit message from CVS:
Now set XVIDEO_LIBS only if the Xv library is found. Fixed matroska check
so that it doesn't stop the configure if it fails.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8f78d7bc..57f2e3e5 100644 --- a/configure.ac +++ b/configure.ac @@ -425,17 +425,23 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink-Xv, [ AC_CHECK_LIB(Xv_pic, XvQueryExtension, HAVE_XVIDEO="yes", HAVE_XVIDEO="no", $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) - XVIDEO_LIBS="-lXv_pic -lXext" - dnl try again using something else if we didn't find it first - if test x$HAVE_XVIDEO = xno; then - AC_CHECK_LIB(Xv, XvQueryExtension, + if test x$HAVE_XVIDEO = xyes; then + XVIDEO_LIBS="-lXv_pic -lXext" + AC_SUBST(XVIDEO_LIBS) + else + dnl try again using something else if we didn't find it first + if test x$HAVE_XVIDEO = xno; then + AC_CHECK_LIB(Xv, XvQueryExtension, HAVE_XVIDEO="yes", HAVE_XVIDEO="no", $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) - XVIDEO_LIBS="-lXv -lXext" - fi - AC_SUBST(XVIDEO_LIBS) + if test x$HAVE_XVIDEO = xyes; then + XVIDEO_LIBS="-lXv -lXext" + AC_SUBST(XVIDEO_LIBS) + fi + fi + fi fi ]) |