svn commit: samba r6617 - in branches/SAMBA_4_0/source: build/smb_build lib/socket_wrapper

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-05 11:13:16 +0000 (Thu, 05 May 2005)
New Revision: 6617

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6617

Log:
Let --enable-developer imply --enable-socket-wrapper
Add socket-wrapper-enabled test target and use that by 
default when the socket wrapper was included

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-04 19:16:22 UTC (rev 6616)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-05 11:13:16 UTC (rev 6617)
@@ -150,9 +150,15 @@
 
 basics: idl proto_exists
 
-test: all
+test: @DEFAULT_TEST_TARGET@
+
+test-swrap: all
+	export SOCKET_WRAPPER_DIR=.
 	./script/tests/selftest.sh `pwd`/prefix-test
 	
+test-noswrap: all
+	./script/tests/selftest.sh `pwd`/prefix-test
+
 __EOD__
 
 	return $output;

Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4	2005-05-04 19:16:22 UTC (rev 6616)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4	2005-05-05 11:13:16 UTC (rev 6617)
@@ -1,5 +1,15 @@
 AC_ARG_ENABLE(socket-wrapper, 
-[  --enable-socket-wrapper         Turn on socket wrapper library (default=no)],
-    [if eval "test x$enable_socket_wrapper = xyes"; then
+[  --enable-socket-wrapper         Turn on socket wrapper library (default=no)])
+
+DEFAULT_TEST_TARGET=test-noswrap
+
+if eval "test x$developer = xyes"; then
+	enable_socket_wrapper=yes
+fi
+    
+if eval "test x$enable_socket_wrapper = xyes"; then
         AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library])
-    fi])
+	DEFAULT_TEST_TARGET=test-swrap
+fi
+
+AC_SUBST(DEFAULT_TEST_TARGET)