Author: jpeach Date: 2007-05-23 20:46:07 +0000 (Wed, 23 May 2007) New Revision: 23097
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23097 Log: Add a new configure option to disable building SWAT (it is still built by default). Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2007-05-23 20:38:14 UTC (rev 23096) +++ branches/SAMBA_3_0/source/Makefile.in 2007-05-23 20:46:07 UTC (rev 23097) @@ -155,7 +155,7 @@ # Note that all executable programs now provide for an optional executable suffix. -SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @EXTRA_SBIN_PROGS@ +SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @@ -1713,7 +1713,7 @@ @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 Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2007-05-23 20:38:14 UTC (rev 23096) +++ branches/SAMBA_3_0/source/configure.in 2007-05-23 20:46:07 UTC (rev 23097) @@ -338,6 +338,21 @@ 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="./" Modified: branches/SAMBA_3_0_26/source/Makefile.in =================================================================== --- branches/SAMBA_3_0_26/source/Makefile.in 2007-05-23 20:38:14 UTC (rev 23096) +++ branches/SAMBA_3_0_26/source/Makefile.in 2007-05-23 20:46:07 UTC (rev 23097) @@ -148,7 +148,7 @@ # Note that all executable programs now provide for an optional executable suffix. -SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @EXTRA_SBIN_PROGS@ +SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @@ -1593,7 +1593,7 @@ @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 Modified: branches/SAMBA_3_0_26/source/configure.in =================================================================== --- branches/SAMBA_3_0_26/source/configure.in 2007-05-23 20:38:14 UTC (rev 23096) +++ branches/SAMBA_3_0_26/source/configure.in 2007-05-23 20:46:07 UTC (rev 23097) @@ -337,6 +337,21 @@ 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="./"
