1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Index: kioslave/smb/configure.in.bot
===================================================================
--- kioslave/smb/configure.in.bot (revision 420060)
+++ kioslave/smb/configure.in.bot (working copy)
@@ -1,4 +1,4 @@
-if test "$have_libsmbclient" = no; then
+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
echo ""
echo "You're missing libsmbclient from samba 3.0"
echo "KDE will not be able to browse windows shares without it,"
Index: kioslave/smb/configure.in.in
===================================================================
--- kioslave/smb/configure.in.in (revision 420060)
+++ kioslave/smb/configure.in.in (working copy)
@@ -1,20 +1,34 @@
AC_DEFUN([SMB_CHECK],
[
AC_REQUIRE([KDE_CHECK_LARGEFILE])
-have_libsmbclient=yes
-KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
-KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
-AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
+AC_ARG_WITH(samba,
+ [AS_HELP_STRING(--with-samba,
+ [enable the samba ioslave @<:@default=check@:>@])],
+ [], with_samba=check)
-SMBCLIENT_EXTRA_LIBS=""
-AC_CHECK_FUNC(yp_get_default_domain, [],
+have_libsmbclient=no
+if test "x$with_samba" != xno; then
+ have_libsmbclient=yes
+ KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
+ KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
+
+ SMBCLIENT_EXTRA_LIBS=""
+ AC_CHECK_FUNC(yp_get_default_domain, [],
[
KDE_CHECK_LIB(nsl, yp_get_default_domain,
[SMBCLIENT_EXTRA_LIBS="-lnsl"] )
])
-AC_SUBST(SMBCLIENT_EXTRA_LIBS)
+ AC_SUBST(SMBCLIENT_EXTRA_LIBS)
+
+ if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
+ AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
+ fi
+fi
+
+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
+
])
SMB_CHECK
|
GitWeb
