diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-29 02:45:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:09 -0500 |
| commit | be948e60e78cbd75bf0d545418fc02f71fc47b12 (patch) | |
| tree | 3ef5a59793ae31d737ab8c4be71946e19cc82fd6 | |
| parent | bc141c795767cc765731c607f1fb047811da6e03 (diff) | |
| download | samba-be948e60e78cbd75bf0d545418fc02f71fc47b12.tar.gz samba-be948e60e78cbd75bf0d545418fc02f71fc47b12.tar.bz2 samba-be948e60e78cbd75bf0d545418fc02f71fc47b12.zip | |
r15312: Fix dependency on gtksamba when GTK+ is not present
(This used to be commit 8f5e507ce3517bbbf06d3f9ec28d40b7158be1bc)
| -rw-r--r-- | source4/build/m4/public.m4 | 4 | ||||
| -rw-r--r-- | source4/gtk/config.m4 | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 5ac9b24b3f..1539d4ff92 100644 --- a/source4/build/m4/public.m4 +++ b/source4/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/source4/gtk/config.m4 b/source4/gtk/config.m4 index e2056b2f4f..4ca0615876 100644 --- a/source4/gtk/config.m4 +++ b/source4/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) |