From 4b04b843affb065f527ea4ee8d6a68b7947ed0b6 Mon Sep 17 00:00:00 2001 From: James Peach Date: Wed, 23 May 2007 20:46:07 +0000 Subject: r23097: Add a new configure option to disable building SWAT (it is still built by default). (This used to be commit 910d498a0e44d1c2b76ccddef0cf05e693cf580e) --- source3/Makefile.in | 4 ++-- source3/configure.in | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 41316ac67b..955475b1a6 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -155,7 +155,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ # Note that all executable programs now provide for an optional executable suffix. -SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@ +SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @@ -1713,7 +1713,7 @@ bin/timelimit@EXEEXT@: script/tests/timelimit.o @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ install-everything: install installmodules diff --git a/source3/configure.in b/source3/configure.in index 3716299d9e..04baf8aafb 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -338,6 +338,21 @@ AC_LIBREPLACE_CC_CHECKS m4_include(lib/socket_wrapper/config.m4) + +AC_ARG_ENABLE(swat, +[ --enable-swat Build the SWAT tool (default=yes)], +[ + case "$enable_swat" in + no) ;; + *) + SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)' + SWAT_INSTALL_TARGETS=installswat + ;; + esac + AC_SUBST(SWAT_SBIN_TARGETS) + AC_SUBST(SWAT_INSTALL_TARGETS) +]) + ################################################# # set prefix for 'make test' selftest_prefix="./" -- cgit