diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-02-17 17:06:46 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-02-17 17:06:46 +0000 |
| commit | 93b138a20c92ac960410c63dd3c76e375328ab50 (patch) | |
| tree | 5dc14ff2e5799930cf5d90356cbe8143d70b2e81 /configure.ac | |
| parent | a54235a99b258c372f7b17f32e9f19b19dacc690 (diff) | |
| download | xine-lib-93b138a20c92ac960410c63dd3c76e375328ab50.tar.gz xine-lib-93b138a20c92ac960410c63dd3c76e375328ab50.tar.bz2 | |
fixing the xine_check Xv problem (using Xv calls, but no Xv dependency is allowed)
with Daniel's solution: statically linking in libXv.a if available, otherwise
dlopen() dynamic one
CVS patchset: 4186
CVS date: 2003/02/17 17:06:46
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e1654ab81..b7519bcd0 100644 --- a/configure.ac +++ b/configure.ac @@ -395,9 +395,12 @@ AC_CHECK_LIB(Xv, XvShmCreateImage, [ AC_MSG_CHECKING(for $xv_lib location) if test -f "$xv_path/$xv_lib"; then AC_MSG_RESULT(found in $xv_path) - XV_LIB="-lXv" + XV_LIB="-L$xv_path -lXv" AC_DEFINE(HAVE_XV,1,[Define this if you have libXv installed]) ac_have_xv="yes" + if test x$xv_lib = "xlibXv.a" ; then + AC_DEFINE(HAVE_XV_STATIC,1,[Define this if you have libXv.a]) + fi else AC_MSG_RESULT(not found in $xv_path) echo @@ -411,6 +414,7 @@ AC_CHECK_LIB(Xv, XvShmCreateImage, echo fi ],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") +AM_CONDITIONAL(HAVE_XV_STATIC, test x$ac_have_xv = "xyes" -a x$xv_lib = "xlibXv.a") dnl dnl xine_check use Xv functions API. dnl |