audioscrobbler: fix use of uninitialized variable

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 59352b8994a6a4e0e7280a78c0906915bc0becb9..c03f345c84a035bd1db5e62f724cd8b9c53c0a80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1917,6 +1917,23 @@ then
 fi
 AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"])
 
+dnl
+dnl  DCP plugin (using asdcplib)
+dnl
+AC_ARG_ENABLE(dcp,
+  AS_HELP_STRING([--enable-dcp],[Digital Cinema Package support using asdcplib (default auto)]))
+have_asdcp="no"
+AS_IF([test "x${enable_dcp}" != "no"], [
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADERS( [[AS@&t@_DCP.h]],
+    [have_asdcp="yes"],
+    [AS_IF( [test "x${enable_dcp}" = "yes"],
+      [AC_MSG_ERROR( [ ASDCP library cannot be found (needed for dcp module). Either use --enable-dcp=no or install asdcp library: http://www.cinecert.com/asdcplib/download/] )])
+     ])
+  AC_LANG_POP(C++)
+])
+AM_CONDITIONAL(HAVE_ASDCP, [test "${have_asdcp}" != "no"])
+
 dnl
 dnl  Demux plugins
 dnl
@@ -2955,7 +2972,10 @@ AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"])
 PKG_CHECK_MODULES([GL], [gl], [
   have_gl="yes"
 ], [
-  AC_CHECK_HEADER([GL/gl.h], [
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+    [#include <GL/gl.h>]], [
+    [int t0 = GL_TEXTURE0;]])
+  ], [
     have_gl="yes"
     GL_CFLAGS=""
     AS_IF([test "${SYS}" = "mingw32"], [
@@ -3229,17 +3249,6 @@ if test "${enable_android_surface}" = "yes"; then
 fi
 
 
-dnl
-dnl  iOS vout module
-dnl
-AC_ARG_ENABLE(ios-vout,
-  [  --enable-ios-vout    iOS video output module (default disabled)])
-if test "${enable_ios_vout}" = "yes"
-then
-  VLC_ADD_PLUGIN([vout_ios])
-  VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation])
-fi
-
 dnl
 dnl  iOS ES2 vout module
 dnl