[vlc-commits] x265: use pkg-config for detection
Rafaël Carré
git at videolan.org
Mon Jan 13 23:32:50 CET 2014
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Jan 13 22:25:27 2014 +0100| [a0e6d8c20323d93964b0c46ec028204eea2a5077] | committer: Rafaël Carré
x265: use pkg-config for detection
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a0e6d8c20323d93964b0c46ec028204eea2a5077
---
configure.ac | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c4647e..9504126 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2750,28 +2750,7 @@ AC_ARG_WITH(x262-tree,
fi
dnl x265 encoder
-AC_ARG_ENABLE(x265,
- AS_HELP_STRING([--enable-x265],[H265 / HEVC encoding support with libx265 (default enabled)]))
-AS_IF( [test "${enable_x265}" != "no"],[
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-#include <x265.h>
-#if X265_BUILD != 4
-# error Fail
-#endif
- ])], [
- AC_CHECK_LIB([x265],[x265_encoder_open_4], [
- VLC_ADD_PLUGIN([x265])
- VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread])
- ], [
- AC_MSG_ERROR([x265 library not found])
- ], [-lstdc++ -lm -lpthread])
- ], [
- AS_IF([test "${enable_x265}" = "yes"], [
- AC_MSG_ERROR([x265.h not found])
- ])
- ])
-])
-
+PKG_ENABLE_MODULES_VLC([X265],, [x265], [HEVC/H.265 encoder], [auto])
dnl
dnl H264 encoder plugin (10-bit lib264)
More information about the vlc-commits
mailing list