r6617: Let --enable-developer imply --enable-socket-wrapper
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 May 2005 11:13:16 +0000 (11:13 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:16:31 +0000 (13:16 -0500)
Add socket-wrapper-enabled test target and use that by
default when the socket wrapper was included
(This used to be commit d3b0ad8b4b6f8ee80a9c77e1102960d51ced5a5f)

source4/build/smb_build/makefile.pm
source4/lib/socket_wrapper/config.m4

index 3b36a94334a8962ceb2f4c77e17ae22f50655aa6..98d70f6c1c0c4ff8f32f20ed6c074d876bc056da 100644 (file)
@@ -150,9 +150,15 @@ pch_clean:
 
 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;
index 97984d0436122c7d521902b67a0357a34b40cf7b..69024c869db422b20e4bbb017e946bda6958ba91 100644 (file)
@@ -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)