[vlc-devel] commit: Revert "samba: simplify the configure test." ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 26 09:56:50 2009 +0200| [34df295511c85c0c248911cba8c722195d472377] | committer: Rémi Duraffort 

Revert "samba: simplify the configure test."

This reverts commit 26ad82e32be3ef852e577ab320db03e9a55f3c5a.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=34df295511c85c0c248911cba8c722195d472377
---

 configure.ac |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index fb9bb48..3c822c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2250,10 +2250,15 @@ dnl
 AC_ARG_ENABLE(smb,
   [  --enable-smb            smb input module (default enabled)])
 if test "${enable_smb}" != "no"; then
-  AC_CHECK_HEADERS(libsmbclient.h, [
-    VLC_ADD_PLUGIN([access_smb])
-    VLC_ADD_LIBS([access_smb],[-lsmbclient])
-  ],[AC_MSG_ERROR([cannot find libsmbclient headers])])
+  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 ])
+  AC_CHECK_MEMBER([struct _SMBCCTX.close_fn],
+    AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),,
+    [#include <libsmbclient.h>])
 fi
 
 dnl