svn commit: samba r15312 - in branches/SAMBA_4_0/source: build/m4 gtk ntvfs/cifs_posix_cli

jelmer at samba.org jelmer at samba.org
Sat Apr 29 02:45:07 GMT 2006


Author: jelmer
Date: 2006-04-29 02:45:06 +0000 (Sat, 29 Apr 2006)
New Revision: 15312

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15312

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

Modified:
   branches/SAMBA_4_0/source/build/m4/public.m4
   branches/SAMBA_4_0/source/gtk/config.m4
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/public.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/public.m4	2006-04-28 15:37:15 UTC (rev 15311)
+++ branches/SAMBA_4_0/source/build/m4/public.m4	2006-04-29 02:45:06 UTC (rev 15312)
@@ -19,10 +19,6 @@
 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

Modified: branches/SAMBA_4_0/source/gtk/config.m4
===================================================================
--- branches/SAMBA_4_0/source/gtk/config.m4	2006-04-28 15:37:15 UTC (rev 15311)
+++ branches/SAMBA_4_0/source/gtk/config.m4	2006-04-29 02:45:06 UTC (rev 15312)
@@ -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)


Property changes on: branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli
___________________________________________________________________
Name: svn:ignore
   - proto.h

   + *.d
proto.h




More information about the samba-cvs mailing list