Fix logic

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index dbad5350d21853dfd268c363963a433466b921b0..3063ab784556633f0d44cdc3fdc0ce74b9e1062a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -392,7 +392,7 @@ lt_cv_deplibs_check_method=pass_all
 dnl
 dnl Gettext stuff
 dnl
-AM_GNU_GETTEXT_VERSION(0.15)
+AM_GNU_GETTEXT_VERSION(0.16.1)
 AM_GNU_GETTEXT([external])
 VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
 
@@ -3741,10 +3741,10 @@ if test "${enable_x264}" != "no"; then
       AC_MSG_RESULT(yes)
       VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
       VLC_ADD_LIBS([x264],[-L${real_x264_tree}])
-      LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
-      AC_CHECK_LIB(x264, x264_encoder_open, [
-        VLC_ADD_BUILTINS([x264])
-        VLC_ADD_LIBS([x264],[-lx264])
+      PKG_CHECK_MODULES(X264,x264, [
+        VLC_ADD_PLUGINS([x264])
+        VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+        VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
       ],[
         AC_MSG_ERROR([the specified tree hasn't been compiled])
       ])
@@ -3754,11 +3754,11 @@ if test "${enable_x264}" != "no"; then
       AC_MSG_ERROR([the specified tree doesn't have x264.h])
     fi
   else
-    LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
     AC_CHECK_HEADERS(x264.h, [
-      AC_CHECK_LIB(x264, x264_encoder_open, [
+      PKG_CHECK_MODULES(X264,x264, [
         VLC_ADD_PLUGINS([x264])
-        VLC_ADD_LIBS([x264],[-lx264])
+        VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+        VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
       ],[
         if test "${enable_x264}" = "yes"; then
             AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
@@ -3823,7 +3823,7 @@ dnl asa/csri subtitle rendering module
 dnl
 AC_ARG_ENABLE(csri,
   [  --enable-csri          Subtitle support using CSRI / asa (default disabled)])
-AS_IF( [test "${enable_csri}" != "no"], [
+AS_IF( [test "${enable_csri}" = "yes"], [
   PKG_CHECK_MODULES(CSRI,
       csri >= 0.1.0,
       [
@@ -3840,7 +3840,7 @@ dnl asa demuxer
 dnl
 AC_ARG_ENABLE(asademux,
   [  --enable-asademux      asa subtitle demuxing (default disabled)])
-AS_IF( [test "${enable_asa}" != "no"], [
+AS_IF( [test "${enable_asademux}" = "yes"], [
   PKG_CHECK_MODULES(PCRE,
       libpcre >= 6.5,
       [