summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-04 17:10:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:00:15 -0500
commit953f3c741806a578f89d28f2c1c80868aea1404a (patch)
tree937ba8ea06b8d987af6a0ece6e295d369c07c074 /source4
parent770edafbf2e284b246fb29e936a19476eacde87f (diff)
downloadsamba-953f3c741806a578f89d28f2c1c80868aea1404a.tar.gz
samba-953f3c741806a578f89d28f2c1c80868aea1404a.tar.bz2
samba-953f3c741806a578f89d28f2c1c80868aea1404a.zip
r14913: readd --with-selftest-prefix as it's needed
to workarround the 108 char limitation on unix socket paths. make test fails when I try to use ./st in /home/People/metze/devel/samba/4.0/samba4-ci/source/ metze (This used to be commit 2bef8208207151dc653c875f12058369c96eb9b0)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_path.m418
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 19 insertions, 1 deletions
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 274f74fca3..396933df52 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -122,6 +122,24 @@ AC_SUBST(sbindir)
AC_SUBST(winbindd_socket_dir)
AC_SUBST(modulesdir)
+#################################################
+# set prefix for 'make test'
+# this is needed to workarround the 108 char
+# unix socket path limitation!
+#
+selftest_prefix="./st"
+AC_SUBST(selftest_prefix)
+AC_ARG_WITH(selftest-prefix,
+[ --with-selftest-prefix=DIR The prefix where make test will be runned ($selftest_prefix)],
+[ case "$withval" in
+ yes|no)
+ AC_MSG_WARN([--with-selftest-prefix called without argument - will use default])
+ ;;
+ * )
+ selftest_prefix="$withval"
+ ;;
+ esac])
+
debug=no
AC_ARG_ENABLE(debug,
[ --enable-debug Turn on compiler debugging information (default=no)],
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 31e33f6d57..7b57470f81 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -67,7 +67,7 @@ sub _prepare_path_vars($)
$self->output(<< "__EOD__"
prefix = $self->{config}->{prefix}
exec_prefix = $self->{config}->{exec_prefix}
-selftest_prefix = ./st
+selftest_prefix = $self->{config}->{selftest_prefix}
VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
srcdir = $self->{config}->{srcdir}
builddir = $self->{config}->{builddir}