[vlc-devel] [PATCH] Revert "Switch smbclient detection to pkg-config"

[Zoran Turalija]

This reverts commit 783ebff1298ce44abacb1e394333b892ac401d18.

Ubuntu (hardy - raring) and Debian (all except experimental/rc-buggy)
do not have smbclient.pc file in their libsmbclient-dev.

Agreed with j-b on irc.
---
 configure.ac              |   11 ++++++++++-
 modules/access/Modules.am |    4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b44139..df3e7ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1741,7 +1741,16 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0]
 dnl
 dnl  libsmbclient plugin
 dnl
-PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto])
+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
 
 
 dnl
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index e6c1b41..3ca42d4 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -275,8 +275,8 @@ endif
 ### Network streams ###
 
 libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS)
+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
 if HAVE_WIN32
 libaccess_smb_plugin_la_LIBADD += -lmpr
 endif
-- 
1.7.10.4


-- 
Kind regards,
Zoran Turalija