patch-configure_in 3.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273
  1. --- xbmc-14.0-Helix.orig/configure.in 2014-12-22 17:11:35.000000000 -0600
  2. +++ xbmc-14.0-Helix/configure.in 2014-12-25 14:08:39.073043750 -0600
  3. @@ -55,13 +55,7 @@ AC_DEFUN([XB_ADD_CODEC],
  4. # check for library basenames
  5. AC_DEFUN([XB_FIND_SONAME],
  6. [
  7. - if echo "$host" | grep -q freebsd ; then
  8. - AC_MSG_CHECKING([for lib$2 soname])
  9. - $1_SONAME=[`ldconfig -r | sed -n "s;.* \(/.*lib$2\.so.*\)$;\1;p" | head -n 1`]
  10. - if test x$$1_SONAME != x ; then
  11. - $1_SONAME=[`basename $$1_SONAME`]
  12. - fi
  13. - elif [[ "$host_vendor" != "apple" ]]; then
  14. + set -x
  15. AC_MSG_CHECKING([for lib$2 soname])
  16. $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS $4 -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
  17. if [[ -z $$1_FILENAME ]]; then
  18. @@ -71,24 +65,6 @@ AC_DEFUN([XB_FIND_SONAME],
  19. if [[ ! -z $$1_FILENAME ]]; then
  20. $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
  21. fi
  22. - else
  23. - AC_MSG_CHECKING([for lib$2 dylib])
  24. - gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
  25. - env_lib_path=[`echo $LDFLAGS | sed 's/-L[ ]*//g'`]
  26. - if test "$cross_compiling" = yes; then
  27. - host_lib_path=""
  28. - else
  29. - host_lib_path="/usr/lib /usr/local/lib"
  30. - fi
  31. - for path in $gcc_lib_path $env_lib_path $host_lib_path; do
  32. - lib=[`ls -- $path/lib$2.dylib 2>/dev/null`]
  33. - if test x$lib != x; then
  34. - # we want the path/name that is embedded in the dylib
  35. - $1_FILENAME=[`otool -L $lib | grep -v lib$2.dylib | grep lib$2 | awk '{V=1; print $V}'`]
  36. - $1_SONAME=[`basename $$1_FILENAME`]
  37. - fi
  38. - done
  39. - fi
  40. if [[ -z "$$1_SONAME" ]]; then
  41. AC_MSG_RESULT([no])
  42. if test -z "$3" || test "x${$3}" = "xyes"; then
  43. @@ -1015,7 +991,7 @@ if test "$use_gles" = "yes"; then
  44. AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
  45. AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
  46. AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
  47. - LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
  48. + LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lkhrn_static -lpthread -lm"
  49. else
  50. AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
  51. AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
  52. @@ -1066,21 +1042,6 @@ AC_CHECK_HEADER([vorbis/vorbisfile.h],,
  53. AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
  54. AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library))
  55. -XB_FIND_SONAME([CURL], [curl])
  56. -AC_MSG_CHECKING([for CRYPTO_set_locking_callback(0) in $CURL_SONAME])
  57. -if test "$host_vendor" = "apple" ; then
  58. - libchecker="$NM"
  59. - searchpattern="T [_]?CRYPTO_set_locking_call"
  60. -else
  61. - libchecker="$READELF -s"
  62. - searchpattern="CRYPTO_set_locking_call"
  63. -fi
  64. -if test $($libchecker $CURL_FILENAME | grep -Eq "${searchpattern}" ; echo $?) -eq 0 ; then
  65. - AC_MSG_RESULT(yes)
  66. - AC_DEFINE([HAS_CURL_STATIC], [1], [Whether OpenSSL inside libcurl is static.])
  67. -else
  68. - AC_MSG_RESULT(no)
  69. -fi
  70. AC_CHECK_HEADER([openssl/crypto.h], AC_DEFINE([HAVE_OPENSSL],[1],[Define if we have openssl]),)
  71. AC_CHECK_HEADER([gcrypt.h], gcrypt_headers_available=yes,gcrypt_headers_available=no)