fixed: removed now deleted libbdnav from build system

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32326 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/Makefile.in b/Makefile.in
index c0c01a6..5b9091e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,10 +62,6 @@ DVDPCODECS_DIRS= \
        xbmc/cores/dvdplayer/Codecs \
        xbmc/cores/dvdplayer/Codecs/libdvd \
 
-ifneq (@HAVE_LIBBLURAY@,1)
-DVDPCODECS_DIRS+=xbmc/cores/dvdplayer/Codecs/libbdnav
-endif
-
 ifneq (@USE_EXTERNAL_LIBASS@,1)
 DVDPCODECS_DIRS+=lib/libass/xbmc
 endif
@@ -272,8 +268,6 @@ xbmc/utils/utils.a: force
        $(MAKE) -C xbmc/utils
 xbmc/osx/osx.a: force
        $(MAKE) -C xbmc/osx
-xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a: force
-       $(MAKE) -C xbmc/cores/dvdplayer/Codecs/libbdnav
 xbmc/lib/libapetag/.libs/libapetag.a: force
        $(MAKE) -C xbmc/lib/libapetag
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
@@ -383,7 +377,6 @@ externals: codecs libs python visualizations screensavers
 
 xcode_depends: \
        codecs libs python visualizations screensavers eventclients skins \
-       xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a \
        xbmc/lib/libsquish/libsquish-@ARCH@.a \
        xbmc/lib/libapetag/.libs/libapetag.a \
        xbmc/lib/cmyth/libcmyth/libcmyth.a \
@@ -441,10 +434,6 @@ OBJSXBMC=  \
        lib/xbmc-dll-symbols/dll-symbols.a \
        xbmc/settings/settings.a
 
-ifneq (@HAVE_LIBBLURAY@,1)
-OBJSXBMC+= xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a
-endif
-
 ifeq (@HAVE_XBMC_NONFREE@,1)
 OBJSXBMC+= \
        xbmc/lib/libXBMS/libxbms-@ARCH@.a \

diff --git a/bootstrap b/bootstrap
index 8485ea7..22e62df 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -6,7 +6,6 @@ autoreconf -vif
 autoreconf -vif lib/cpluff
 # we must autoreconf libass as we don't know till later if it's used.
 autoreconf -vif lib/libass
-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libbdnav
 # order matters with libbdnav and friends
 [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \
   autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss

diff --git a/configure.in b/configure.in
index 299cb59..c308968 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1906,17 +1906,6 @@ if expr "X$host_cpu" : 'Xarm.*' > /dev/null; then :; else
 fi
 ], [0])
 
-XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
-  if test "$host_vendor" = "apple" ; then
-    ./configure --with-ssl-dir=/opt/local/include CFLAGS="$CFLAGS"
-  else
-    ./configure --without-openssl \
-      --host=$host_alias \
-      --build=$build_alias \
-      --target=$target_alias CFLAGS="$CFLAGS"
-  fi
-], [0])
-
 XB_CONFIG_MODULE([xbmc/lib/libapetag], [
   if test "$host_vendor" = "apple" ; then
     CFLAGS="$CFLAGS -fno-common" \