Skip to content

V
vlc
Commit a7913428 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Backport of revision 13277

parent 4142aeeb
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.ac
View file @ a7913428
...@@ -2879,7 +2879,7 @@ if test "${enable_x264}" != "no"; then ...@@ -2879,7 +2879,7 @@ if test "${enable_x264}" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}]) VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_BUILTINS([x264]) VLC_ADD_BUILTINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264]) VLC_ADD_LDFLAGS([x264],[-lx264])
...@@ -2892,7 +2892,7 @@ if test "${enable_x264}" != "no"; then ...@@ -2892,7 +2892,7 @@ if test "${enable_x264}" != "no"; then
AC_MSG_ERROR([the specified tree doesn't have x264.h]) AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi fi
else else
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_HEADERS(x264.h, [ AC_CHECK_HEADERS(x264.h, [
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_PLUGINS([x264]) VLC_ADD_PLUGINS([x264])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment