X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=bf610543d5c233851b5cc95cd32acb28eff611bc;hb=971b8d4c550d6b013e61f9ec3497c7cb1fbfb32f;hp=f2256e46c21c9b745a80400e7596176bb4198ba8;hpb=c2ddff0eb62caab1015fcb84e00714b02710c631;p=vlc

diff --git a/configure.ac b/configure.ac
index f2256e46c2..bf610543d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1025,7 +1025,7 @@ AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden],
     [CFLAGS="${CFLAGS_save} -fvisibility=hidden"
      AC_TRY_COMPILE([],,ac_cv_c_visibility_hidden=yes, ac_cv_c_visibility_hidden=no)])
 if test "${ac_cv_c_visibility_hidden}" != "no"; then
-    VLC_ADD_CFLAGS([plugin],[-fvisibility=hidden])
+    VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden])
 fi
 
 dnl Check for -fvisibility-inlines-hidden (breaks x86_64 linkers)
@@ -1560,10 +1560,24 @@ then
     PKG_CHECK_MODULES(LUA, lua >= 5.1,
       [ have_lua=yes ],
       [ 
-       AC_MSG_WARN([lua >= 5.1 not found!])
+        have_lua=yes
+        AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], 
+	  [],  
+          [ have_lua=no ] )
+	AC_CHECK_LIB(  lua5.1 , luaL_newstate, 
+          [LUA_LIBS="-llua5.1"],
+	  AC_CHECK_LIB( lua51 , luaL_newstate, 
+            [LUA_LIBS="-llua51"],
+		  AC_CHECK_LIB( lua , luaL_newstate, 
+		    [LUA_LIBS="-llua"],
+	      [ have_lua=no
+                AC_MSG_WARN([lua >= 5.1 not found!])
+              ])
+	    ])
+	  )
       ])
     ])
-  if test "x${have_lua}" = "xyes"; then
+  if test "x${have_lua}" = "xyes" ;  then
      AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
      VLC_ADD_PLUGINS([luaplaylist])
      VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS])
@@ -5311,7 +5325,14 @@ AS_IF([test "${enable_gnutls}" != "no"], [
   ])
 ])
 
-AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect
+dnl it and looks for libgcrypt headers in the wrong place.
+if test "${host_cpu}" = "${build_cpu}"
+then
+  AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+else
+  AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no")
+fi
 AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])