vlc | branch: master | Nicolas Chauvet <[email protected]> | Tue Feb 26 12:47:43 2013 +0100| [783ebff1298ce44abacb1e394333b892ac401d18] | committer: Jean-Baptiste Kempf
Switch smbclient detection to pkg-config Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=783ebff1298ce44abacb1e394333b892ac401d18 --- configure.ac | 11 +---------- modules/access/Modules.am | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index c9666e5..421ba14 100644 --- a/configure.ac +++ b/configure.ac @@ -1725,16 +1725,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0] dnl dnl libsmbclient plugin dnl -AC_ARG_ENABLE(smb, - [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) -if test "${enable_smb}" != "no"; then - AC_CHECK_HEADERS(libsmbclient.h, - [ VLC_ADD_PLUGIN([access_smb]) - VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], - [ if test -n "${enable_smb}"; then - AC_MSG_ERROR([cannot find libsmbclient headers]) - fi ]) -fi +PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto]) dnl diff --git a/modules/access/Modules.am b/modules/access/Modules.am index d4bfa25..9722720 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -267,8 +267,8 @@ endif ### Network streams ### libaccess_smb_plugin_la_SOURCES = smb.c -libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) -libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) +libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS) +libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS) if HAVE_WIN32 libaccess_smb_plugin_la_LIBADD += -lmpr endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
