2 ===================================================================
3 --- configure.ac (revision 1107)
4 +++ configure.ac (working copy)
6 dnl ---------------------------------------------
8 dnl ---------------------------------------------
11 - CFLAGS="-idirafter \$(top_srcdir)/msvc/include $CFLAGS"
12 - LDFLAGS="-no-undefined $LDFLAGS"
15 - LDFLAGS="-no-undefined $LDFLAGS"
18 - AC_CHECK_LIB(c, dlopen,
20 - AC_CHECK_LIB(dl, dlopen,
21 - DYNAMIC_LD_LIBS="-ldl",
22 - AC_MSG_ERROR(dynamic linker needed)))
23 - AC_SUBST(DYNAMIC_LD_LIBS)
26 +AC_ARG_WITH( [libdvdcss],
27 + [ --with-libdvdcss[=PATH] force linking against libdvdcss],
28 + [if test x"$withval" != xno; then
31 + if test x"$withval" != xyes; then
32 + dvdcss_path=$withval
35 +if test x"$link_dvdcss" != xyes; then
37 + AC_CHECK_FUNC( dlopen,
39 + AC_CHECK_LIB( dl, dlopen,
41 + AC_MSG_ERROR(You need libdl (dlopen))
45 +dnl link with libdvdcss
46 + if test -z "$dvdcss_path"; then
47 + AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
48 + [ CSS_LIBS=-ldvdcss ],
49 + AC_MSG_ERROR(You need libdvdcss.so.2 or later)
51 + AC_CHECK_HEADERS(dvdcss/dvdcss.h,
53 + AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
56 + saved_CFLAGS=$CFLAGS
57 + CFLAGS="$CFLAGS -L$dvdcss_path/lib"
58 + AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
59 + [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
60 + CSS_CFLAGS=-I$dvdcss_path/include ],
61 + AC_MSG_ERROR(You need libdvdcss.so.2 or later)
63 + CFLAGS=$saved_CFLAGS
64 + dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
65 + saved_CPPFLAGS=$CPPFLAGS
66 + CPPFLAGS="-w $CPPFLAGS -I$dvdcss_path/include"
67 + AC_CHECK_HEADERS(dvdcss/dvdcss.h,
69 + AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
71 + CPPFLAGS=$saved_CPPFLAGS
79 dnl ---------------------------------------------
81 dnl ---------------------------------------------
83 ===================================================================
84 --- autogen.sh (revision 1107)
85 +++ autogen.sh (working copy)
87 try_libtool_executable() {
89 LT="`$libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-\;]//g'`"
90 - if test "$LT" -ne "" ; then
91 + if test "$LT" -ne "0" ; then
92 LIBTOOL_MIN="`echo $LIBTOOL_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`"
93 if test $LT -lt 100 ; then