diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-06-30 23:12:12 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-06-30 23:12:12 +0000 |
| commit | f95fc68504d2abfc8405d3c873f565982a2e0fc3 (patch) | |
| tree | aa3afd81290ee7dcd5b9da65ba9773094402fc52 | |
| parent | 61451b353e19b7df8f259345c404bfd9beee72c4 (diff) | |
| download | xine-lib-f95fc68504d2abfc8405d3c873f565982a2e0fc3.tar.gz xine-lib-f95fc68504d2abfc8405d3c873f565982a2e0fc3.tar.bz2 | |
removed check for libtool for now
CVS patchset: 238
CVS date: 2001/06/30 23:12:12
| -rw-r--r-- | configure.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 6f0ac380a..10d650281 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_PREREQ(2.13) dnl dnl Require libtool minimum version 1.4.0 dnl -AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***)) +dnl AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***)) XINE_MAJOR=0 @@ -165,20 +165,27 @@ 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], +AC_ARG_WITH(xv-path,[ --with-xv-path=path Where libXv.so is installed], xv_path="$withval", xv_path="/usr/X11R6/lib") AC_CHECK_LIB(Xv, XvShmCreateImage, - [ AC_MSG_CHECKING(for libXv.a location) - if test -f "$xv_path/libXv.a"; then + [ AC_MSG_CHECKING(for libXv.so location) + if test -f "$xv_path/libXv.so"; then AC_MSG_RESULT(found in $xv_path) + XV_LIB="-lXv" + AC_DEFINE(HAVE_XV) + ac_have_xv="yes" 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) + echo + echo "****************************************************************" + echo "* if you don't have a libXv.so on your system, use: *" + echo "* ld --whole-archive -shared -o libXv.so.1 libXv.a *" + echo "* to create it or try to use --with-xv-path to set the *" + echo "* location of libXv.so *" + echo "****************************************************************" + echo + fi ],, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") AC_SUBST(XV_LIB) |