Commit 783ebff1 authored by Nicolas Chauvet's avatar Nicolas Chauvet Committed by Jean-Baptiste Kempf

Switch smbclient detection to pkg-config

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 00192607
...@@ -1725,16 +1725,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0] ...@@ -1725,16 +1725,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0]
dnl dnl
dnl libsmbclient plugin dnl libsmbclient plugin
dnl dnl
AC_ARG_ENABLE(smb, PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto])
[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
dnl dnl
......
...@@ -267,8 +267,8 @@ endif ...@@ -267,8 +267,8 @@ endif
### Network streams ### ### Network streams ###
libaccess_smb_plugin_la_SOURCES = smb.c libaccess_smb_plugin_la_SOURCES = smb.c
libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS)
if HAVE_WIN32 if HAVE_WIN32
libaccess_smb_plugin_la_LIBADD += -lmpr libaccess_smb_plugin_la_LIBADD += -lmpr
endif endif
......
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