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

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-05 11:33:10 +0000 (Thu, 05 May 2005)
New Revision: 6621

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

Log:
Warn when the user is trying to use socket wrapper 
while it is not compiled in.

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-05 11:15:24 UTC (rev 6620)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-05-05 11:33:10 UTC (rev 6621)
@@ -154,7 +154,12 @@
 
 test-swrap: all
 	export SOCKET_WRAPPER_DIR=.
+ifeq (@HAVE_SOCKET_WRAPPER@,yes)
 	./script/tests/selftest.sh `pwd`/prefix-test
+else
+	echo "Socket wrapper not built in, unable to run test-swrap"
+	exit 1
+endif
 	
 test-noswrap: all
 	./script/tests/selftest.sh `pwd`/prefix-test

Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4	2005-05-05 11:15:24 UTC (rev 6620)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/config.m4	2005-05-05 11:33:10 UTC (rev 6621)
@@ -2,6 +2,7 @@
 [  --enable-socket-wrapper         Turn on socket wrapper library (default=no)])
 
 DEFAULT_TEST_TARGET=test-noswrap
+HAVE_SOCKET_WRAPPER=no
 
 if eval "test x$developer = xyes"; then
 	enable_socket_wrapper=yes
@@ -10,6 +11,8 @@
 if eval "test x$enable_socket_wrapper = xyes"; then
         AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library])
 	DEFAULT_TEST_TARGET=test-swrap
+	HAVE_SOCKET_WRAPPER=yes
 fi
 
 AC_SUBST(DEFAULT_TEST_TARGET)
+AC_SUBST(HAVE_SOCKET_WRAPPER)