r15312: Fix dependency on gtksamba when GTK+ is not present

diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 5ac9b24b3fae57882a5d74d53d49cfa922bd809c..1539d4ff92c9c98a57b36f7f6d91e83321eda398 100644 (file)
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -19,10 +19,6 @@ dnl #######################################################
 dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
-       if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
-               [SMB_SUBSYSTEM_NOPROTO_][$1]="NO";
-       fi
-
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1

diff --git a/source/gtk/config.m4 b/source/gtk/config.m4
index e2056b2f4fab3dc6f93745c498ea11287bdbbea2..4ca0615876eb3fc631fa78912cc37e25dec0cd68 100644 (file)
--- a/source/gtk/config.m4
+++ b/source/gtk/config.m4
@@ -1,14 +1,14 @@
 dnl # LIB GTK SMB subsystem
 
 SMB_EXT_LIB_FROM_PKGCONFIG(gtk, [glib-2.0 gtk+-2.0 >= 2.4])
-SMB_ENABLE(GTKSMB, NO)
+SMB_ENABLE(gtksamba, NO)
 SMB_ENABLE(gregedit, NO)
 SMB_ENABLE(gwcrontab, NO)
 SMB_ENABLE(gwsam, NO)
 SMB_ENABLE(gepdump, NO)
 
 if test t$SMB_ENABLE_gtk = tYES; then
-       SMB_ENABLE(GTKSMB, YES)
+       SMB_ENABLE(gtksamba, YES)
        SMB_ENABLE(gregedit, YES)
        SMB_ENABLE(gwcrontab, YES)
        SMB_ENABLE(gwsam, YES)