diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-06-14 22:04:56 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-06-14 22:04:56 +0000 |
| commit | 7fa94f42de26c1b07f33844502083bab291865c6 (patch) | |
| tree | b39feb0eee965eaa1d23b7746ce4391c45b0dffc /configure.in | |
| parent | 64dfb3fccb2540f0d7fa2b4bb16c3b715c0402bb (diff) | |
| download | xine-lib-7fa94f42de26c1b07f33844502083bab291865c6.tar.gz xine-lib-7fa94f42de26c1b07f33844502083bab291865c6.tar.bz2 | |
Kill the recurrent libXv.so problem with MDK.
Switch to libtool 1.4, 1.3.x are no more supported. Add a path for
automake, to use it with libtool 1.4.
CVS patchset: 183
CVS date: 2001/06/14 22:04:56
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 3ff8b6070..8219c6dd4 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_PREREQ(2.13) dnl dnl Require libtool minimum version 1.3.5 dnl -AC_PREREQ_LIBTOOL(1.3.5,,AC_MSG_ERROR(*** You should have libtool >= 1.3.5 installed ***)) +AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***)) XINE_MAJOR=0 @@ -165,14 +165,22 @@ AM_CONDITIONAL(HAVE_X11, test x"$no_x" != "xyes") dnl dnl Checks for Xv extension dnl +AC_ARG_WITH(xv-path,[ --with-xv-path=path Where libXv.a is installed], + xv_path="$withval", xv_path="/usr/X11R6/lib") AC_CHECK_LIB(Xv, XvShmCreateImage, - X_LIBS="$X_LIBS -lXv" - AC_DEFINE(HAVE_XV) - ac_have_xv="yes",, - $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) + [ AC_MSG_CHECKING(for libXv.a location) + if test -f "$xv_path/libXv.a"; then + AC_MSG_RESULT(found in $xv_path) + else + AC_MSG_RESULT(not found in $xv_path) + AC_MSG_ERROR(try to use --with-xv-path to set the location of libXv.a) + fi + XV_LIB="$xv_path/libXv.a" + AC_DEFINE(HAVE_XV) + ac_have_xv="yes" ],, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") - +AC_SUBST(XV_LIB) dnl dnl Checks for Xinerama extension |