aboutsummaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-02-04 19:04:35 -0800
committerjmarshallnz <jcmarsha@gmail.com>2014-02-04 19:04:35 -0800
commit9298f7c91023427b13b84a6728639b51108bae55 (patch)
tree5b36b2ea09727d8dde66d70afb0df8e95f76ac62 /configure.in
parentbf4792930c514a8587320eff5d3a03c5dd745530 (diff)
parent9ac31620b6bcf3820e38c3e5504355f98c77584d (diff)
Merge pull request #3198 from sraue/dvdread-config-fix
libdvdnav runs dvdread-config to update CFLAGS and LDFLAGS with libdirs,...
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 730c161c3e..808f74bdcf 100644
--- a/configure.in
+++ b/configure.in
@@ -2867,7 +2867,6 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
--disable-strip \
--disable-opts \
--cc="$CC" &&
- $MAKE dvdread-config &&
mkdir -p `pwd`/../includes/dvdread
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
@@ -2877,7 +2876,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
./configure2 \
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
--extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --with-dvdread-config="`pwd`/../dvdread-config" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--host=$host_alias \
--build=$build_alias \