merge r32878 and part of r32879, revert removing unnecessary dependency on libssl...

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

diff --git a/configure.in b/configure.in
index ea8fb9a..39da1eb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -498,6 +498,8 @@ AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for
 AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([wavpack],     [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([mpeg2],       [main],, AC_MSG_ERROR($missing_library))
 AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
@@ -549,8 +551,6 @@ PKG_CHECK_MODULES([VORBISENC],     [vorbisenc],
 
 # platform dependent libraries
 if test "$host_vendor" = "apple" ; then
-  AC_CHECK_LIB([ssl],       [main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([crypto],    [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([iconv],     [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))