summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 18:51:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 14:03:33 +0100
commitbc282d843d9326233c25f7715c8006b890f89d52 (patch)
tree52ec1592f246539b2beb578831802bd4064e6b50
parenteff6a8c25671c9955159b15e3d36734f6a6b327c (diff)
downloadsamba-bc282d843d9326233c25f7715c8006b890f89d52.tar.gz
samba-bc282d843d9326233c25f7715c8006b890f89d52.tar.bz2
samba-bc282d843d9326233c25f7715c8006b890f89d52.zip
Move configure output details out of perl code.
(This used to be commit e33f357fb00cd504181562eaf2ca1d4511d5ec51)
-rw-r--r--source4/build/smb_build/main.pl7
-rw-r--r--source4/configure.ac9
2 files changed, 9 insertions, 7 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 9690c465a7..27ba2d36e1 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -93,11 +93,4 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir},
summary::show($OUTPUT, \%config::config);
-if ($shared_libs_used) {
- print <<EOF;
-To run binaries without installing, set the following environment variable:
- $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared
-EOF
-}
-
1;
diff --git a/source4/configure.ac b/source4/configure.ac
index b609b4f52c..66556ad641 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -226,3 +226,12 @@ AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
AC_Var = $AC_Var])
$MAKE_SETTINGS
CEOF
+
+if test $USESHARED = true
+then
+ echo "To run binaries without installing, set the following environment variable:"
+ echo "$ac_cv_LIB_PATH_VAR=$builddir/bin/shared"
+fi
+
+echo
+echo "To build Samba, run $ac_cv_path_MAKE"