Skip to content

Commit

Permalink
Merge pull request #7950 from ace20022/bd_config
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins4kodi committed Sep 3, 2015
2 parents 258ed25 + 329190a commit 9ef5897
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -1265,16 +1265,16 @@ fi
# check for libbluray
AS_CASE([x$use_libbluray],
[xyes],[
PKG_CHECK_MODULES([LIBBLURAY],[libbluray >= 0.2.1],[use_libbluray="yes"], AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([LIBBLURAY],[libbluray >= 0.7.0],[use_libbluray="yes"], AC_MSG_ERROR($missing_library))
],
[xauto],[
PKG_CHECK_MODULES([LIBBLURAY],[libbluray >= 0.2.1],[use_libbluray="yes"], [use_libbluray="no"])
PKG_CHECK_MODULES([LIBBLURAY],[libbluray >= 0.7.0],[use_libbluray="yes"], [use_libbluray="no"])
])

AS_CASE([x$use_libbluray],
[xyes],[
INCLUDES="$INCLUDES $LIBBLURAY_CFLAGS";
LIBBLURAY_LIB_BASENAME=`$PKG_CONFIG --libs-only-L "libbluray >= 0.2.1"`;
LIBBLURAY_LIB_BASENAME=`$PKG_CONFIG --libs-only-L "libbluray >= 0.7.0"`;
XB_FIND_SONAME([BLURAY], [bluray], [use_libbluray], [$LIBBLURAY_LIB_BASENAME])
AC_DEFINE([HAVE_LIBBLURAY], 1, [System has libbluray library])
AC_SUBST([HAVE_LIBBLURAY], 1)
Expand Down
2 changes: 1 addition & 1 deletion docs/README.linux
Expand Up @@ -46,7 +46,7 @@ external libraries enabled).
Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
dcadec-dev, default-jre, gawk, gperf, libao-dev, libasound2-dev,
libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev,
libbluray-dev, libboost-dev, libboost-thread-dev, libbz2-dev, libcap-dev, libcdio-dev,
libbluray-dev (>= 0.7.0), libboost-dev, libboost-thread-dev, libbz2-dev, libcap-dev, libcdio-dev,
libcec-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, libcwiid-dev,
libdbus-1-dev, libfontconfig-dev, libfreetype6-dev, libfribidi-dev,
libgif-dev (>= 4.1.6), libgl1-mesa-dev | libgl-dev, libglew-dev, libglu1-mesa-dev | libglu-dev,
Expand Down

0 comments on commit 9ef5897

Please sign in to comment.