Avoid calling dlsym at every code

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index e51943c3eb409a6ac579b85d874dcc8eaf0d28b0..aea59d660944f51fb7930e7d5b350a5a5040e15a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -349,6 +349,7 @@ case "${host_os}" in
         # add ws2 for closesocket, select, recv
         VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
         VLC_ADD_LIBS([libvlccore],[-lmmtimer])
+        AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
    fi
     ;;
   *nto*)
@@ -1630,7 +1631,8 @@ then
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
   AC_ARG_VAR([LUAC], [LUA byte compiler])
-  AC_PATH_PROG(LUAC, luac, [
+  AC_PATH_PROG(LUAC, luac, [false])
+  AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
     AC_MSG_ERROR([Could not find the LUA byte compiler.])
   ])
 fi
@@ -2666,7 +2668,7 @@ AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
 if test "${enable_avcodec}" != "no"
 then
-  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
+  PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
     [
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
@@ -4442,10 +4444,9 @@ AC_ARG_WITH(kde-solid,
 soliddatadir=""
 AS_IF([test "${with_kde_solid}" != "no"], [
   AS_IF([test "${with_kde_solid}" = "yes"], [
-    soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
-    AS_IF([test "x${soliddatadir}" = "x"], [
-      soliddatadir='$(datadir)/kde4/apps/solid/actions'
-    ])
+    kde4datadir="`${KDE4_CONFIG} --install data`"
+    AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+    soliddatadir="${kde4datadir}/solid/actions"
   ], [
     soliddatadir="${with_kde_solid}"
   ])