svn commit: samba r25494 - in branches/SAMBA_3_2: . source

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-03 21:14:20 +0000 (Wed, 03 Oct 2007)
New Revision: 25494

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

Log:
Sanity check --with-samba4srcdir argument.
Modified:
   branches/SAMBA_3_2/
   branches/SAMBA_3_2/source/configure.in


Changeset:

Property changes on: branches/SAMBA_3_2
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_3_2/source/configure.in
===================================================================
--- branches/SAMBA_3_2/source/configure.in	2007-10-03 20:56:29 UTC (rev 25493)
+++ branches/SAMBA_3_2/source/configure.in	2007-10-03 21:14:20 UTC (rev 25494)
@@ -427,10 +427,19 @@
     AC_MSG_ERROR([--with-samba4srcdir should take a path])
   ;;
   * )
-    samba4srcdir="$withval"
-    if test -z "$samba4srcdir" -a ! -f $samba4srcdir; then
-    	AC_MSG_ERROR(['$samba4srcdir' does not  exist!])
+    if test -z "$withval" -a ! -f $withval; then
+    	AC_MSG_ERROR(['$withval' does not  exist!])
     fi
+	
+	if test -f "$withval/selftest/selftest.pl"; then
+		samba4srcdir="$withval"
+	else
+		if test -f "$withval/source/selftest/selftest.pl"; then
+			samba4srcdir="$withval/source"
+		else
+			AC_MSG_ERROR([unable to find selftest.pl in '$withval'!])
+		fi
+	fi
   ;;
  esac
 ])