[vlc-devel] [PATCH] dcp: Integrate asdcplib with .pc files

[Nicolas Bertrand]

---
 configure.ac               |   14 +-------------
 modules/access/Makefile.am |    6 ++----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index fc3429c..ca82873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1920,19 +1920,7 @@ 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 at _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"])
+PKG_ENABLE_MODULES_VLC([ASDCP], [], [asdcplib >= 1.12.58], [asdcplib support], [auto])
 
 dnl
 dnl  Demux plugins
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index c655a47..a8135a2 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -10,11 +10,9 @@ libattachment_plugin_la_SOURCES = access/attachment.c
 access_LTLIBRARIES += libattachment_plugin.la
 
 libdcp_plugin_la_SOURCES = access/dcp/dcpparser.h access/dcp/dcp.cpp access/dcp/dcpparser.cpp
-libdcp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libdcp_plugin_la_LIBADD = $(AM_LIBADD) -lasdcp
-if HAVE_ASDCP
+libdcp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(ASDCP_CFLAGS)
+libdcp_plugin_la_LIBADD = $(AM_LIBADD) $(ASDCP_LIBS)
 access_LTLIBRARIES += libdcp_plugin.la
-endif
 
 libfilesystem_plugin_la_SOURCES = access/fs.h access/file.c access/directory.c access/fs.c
 libfilesystem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-- 
1.7.9.5