diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2013-10-17 09:21:48 +0200 |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2013-12-05 23:51:30 +0000 |
| commit | ad521f604df7aad2dacf993942b257e93fda203b (patch) | |
| tree | e1a4a70ad4f8f2f7af5f00d3a939688c3507f953 /configure.ac | |
| parent | c1dc110ff36297caa61747e1e59a8d9ca85a07b3 (diff) | |
| download | gvfs-ad521f604df7aad2dacf993942b257e93fda203b.tar.gz | |
Require libsmbclient from Samba 3.4.0 or higher
Also remove the old libsmb-compat.h header file.
https://bugzilla.gnome.org/show_bug.cgi?id=573837
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 7cd23a6c..5923b1da 100644 --- a/configure.ac +++ b/configure.ac @@ -583,15 +583,6 @@ if test "x$enable_samba" != "xno"; then else SAMBA_CFLAGS="" fi - - CPPFLAGS="$CPPFLAGS $with_samba_includes" - AC_CHECK_MEMBER(SMBCCTX.flags, - [AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags available in SMBCCTXT])],, - [#include <libsmbclient.h>]) - AC_CHECK_MEMBER(SMBCCTX.close, - [AC_DEFINE(HAVE_SAMBA_OLD_CLOSE, , [Defined if old close is available in SMBCCTXT])],, - [#include <libsmbclient.h>]) - CPPFLAGS="$CPPFLAGS_save" else SAMBA_CFLAGS="" fi @@ -602,28 +593,26 @@ if test "x$enable_samba" != "xno"; then LDFLAGS_save="$LDFLAGS" LDFLAGS="$LDFLAGS -L$with_samba_libs" - AC_CHECK_LIB(smbclient, smbc_option_get,samba_libs="yes", samba_libs="no") + AC_CHECK_LIB(smbclient, smbc_getFunctionStatVFS,samba_libs="yes", samba_libs="no") LDFLAGS="$LDFLAGS_save" if test "x${samba_libs}" != "xno"; then - AC_DEFINE(HAVE_SAMBA,, [Define to 1 if you have the samba 3.0 libraries]) + AC_DEFINE(HAVE_SAMBA,, [Define to 1 if you have the samba libraries]) msg_samba="yes" if test x$with_samba_libs != x/usr/lib; then SAMBA_LIBS="-L$with_samba_libs -lsmbclient" else SAMBA_LIBS="-lsmbclient" fi - AC_CHECK_LIB(smbclient, smbc_getFunctionStatVFS, - AC_DEFINE(HAVE_SAMBA_STAT_VFS, , [Define to 1 if smbclient supports smbc_stat_fn])) else AC_CHECK_LIB(smbclient, smbc_new_context,samba_old_libs="yes", samba_old_libs="no") if test "x${samba_old_libs}" != "xno"; then - msg_samba="Too old, need at least samba 3.0.22" + msg_samba="Too old, need at least samba 3.4.0" fi SAMBA_CFLAGS="" SAMBA_LIBS="" fi fi - AC_MSG_CHECKING(for Samba 3.0 libraries) + AC_MSG_CHECKING(for Samba libraries) AC_MSG_RESULT($msg_samba) fi AM_CONDITIONAL(HAVE_SAMBA, test "$msg_samba" = "yes") |