r23097: Add a new configure option to disable building SWAT (it is still built by

default).

diff --git a/source/Makefile.in b/source/Makefile.in
index 41316ac67b3876cf6d7f2598586d413f7674ac35..955475b1a677dad6819ff02e0b17a3604272ed29 100644 (file)
--- a/source/Makefile.in
+++ b/source/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/source/configure.in b/source/configure.in
index 3716299d9e504184a5ea07d2f21b1148cf834144..04baf8aafbf619878d2b1f7be6b7fb7220114a9a 100644 (file)
--- a/source/configure.in
+++ b/source/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="./"