[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2523-g622667c

Michael Adam obnox at samba.org
Tue Feb 26 13:17:46 GMT 2008


The branch, v3-2-test has been updated
       via  622667c0790c0092bfceced8dc6fb05e781ac5e7 (commit)
      from  7b98620ef16c6969fd21dd9c157aedd4adb117a3 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 622667c0790c0092bfceced8dc6fb05e781ac5e7
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 25 17:42:12 2008 +0100

    configure: put swat-part of config into m4-include file of its own.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in |   17 +----------------
 source/m4/swat.m4   |   27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 source/m4/swat.m4


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 1c326a8..4fadfd7 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -145,22 +145,7 @@ CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
 m4_include(lib/socket_wrapper/config.m4)
 m4_include(lib/nss_wrapper/config.m4)
 
-SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-SWAT_INSTALL_TARGETS=installswat
-
-AC_ARG_ENABLE(swat,
-[AS_HELP_STRING([--enable-swat], [Build the SWAT tool (default=yes)])],
-[
-    case "$enable_swat" in
-	no)
-	    SWAT_SBIN_TARGETS=''
-	    SWAT_INSTALL_TARGETS=''
-	    ;;
-    esac
-])
-
-AC_SUBST(SWAT_SBIN_TARGETS)
-AC_SUBST(SWAT_INSTALL_TARGETS)
+m4_include(m4/swat.m4)
 
 # Probe the gcc version for extra CFLAGS. We always stash these in
 # DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
diff --git a/source/m4/swat.m4 b/source/m4/swat.m4
new file mode 100644
index 0000000..2fdd82e
--- /dev/null
+++ b/source/m4/swat.m4
@@ -0,0 +1,27 @@
+dnl
+dnl Samba3 build environment SWAT configuration
+dnl
+dnl Copyright (C) Michael Adam 2008
+dnl
+dnl Released under the GNU General Public License
+dnl http://www.gnu.org/licenses/
+dnl
+
+
+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
+SWAT_INSTALL_TARGETS=installswat
+
+AC_ARG_ENABLE(swat,
+[AS_HELP_STRING([--enable-swat], [Build the SWAT tool (default=yes)])],
+[
+    case "$enable_swat" in
+	no)
+	    SWAT_SBIN_TARGETS=''
+	    SWAT_INSTALL_TARGETS=''
+	    ;;
+    esac
+])
+
+AC_SUBST(SWAT_SBIN_TARGETS)
+AC_SUBST(SWAT_INSTALL_TARGETS)
+


-- 
Samba Shared Repository


More information about the samba-cvs mailing list