From 3cad0b87dc55f8eab9b00cd3aa01e817b39a5d62 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 13 Mar 2006 02:05:39 +0000
Subject: r14281: Pull apart LIBDIR and MODULESDIR Move
 architecture-independent data to DATADIR (was LIBDIR) (This used to be commit
 2c7b62a861f702067e8df4c3239ac7e377631a15)

---
 source4/build/m4/check_path.m4      | 4 +++-
 source4/build/smb_build/makefile.pm | 3 ++-
 source4/build/smb_build/summary.pm  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 00844da83c..b5654ac25b 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -16,6 +16,7 @@ logfilebase="${localstatedir}"
 lockdir="${localstatedir}/locks"
 piddir="${localstatedir}/run"
 privatedir="\${prefix}/private"
+modulesdir="\${prefix}/modules"
 winbindd_socket_dir="${localstatedir}/run/winbind_pipe"
 
 AC_ARG_WITH(fhs, 
@@ -25,7 +26,7 @@ AC_ARG_WITH(fhs,
     logfilebase="${localstatedir}/log/samba"
     privatedir="${localstatedir}/lib/samba/private"
     sysconfdir="${sysconfdir}/samba"
-    libdir="${libdir}/samba"
+	modulesdir="${libdir}/samba"
     datadir="${datadir}/samba"
     includedir="${includedir}/samba-4.0"
     winbindd_socket_dir="${localstatedir}/run/samba/winbind_pipe"
@@ -119,6 +120,7 @@ AC_SUBST(privatedir)
 AC_SUBST(bindir)
 AC_SUBST(sbindir)
 AC_SUBST(winbindd_socket_dir)
+AC_SUBST(modulesdir)
 
 #################################################
 # set prefix for 'make test'
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 8eaf66ed8a..44e55b17f8 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -75,9 +75,10 @@ BASEDIR = $self->{config}->{prefix}
 BINDIR = $self->{config}->{bindir}
 SBINDIR = $self->{config}->{sbindir}
 LIBDIR = $self->{config}->{libdir}
-MODULESDIR = $self->{config}->{libdir}
+MODULESDIR = $self->{config}->{modulesdir}
 INCLUDEDIR = $self->{config}->{includedir}
 CONFIGDIR = $self->{config}->{sysconfdir}
+DATADIR = $self->{config}->{datadir}
 SWATDIR = $self->{config}->{datadir}/swat
 JSDIR = $self->{config}->{datadir}/js
 SETUPDIR = $self->{config}->{datadir}/setup
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index 5dcd2e3671..95a342e2f9 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -40,7 +40,7 @@ sub show($$)
 	showitem($output, "using extended attributes", ["XATTR"]);
 	showitem($output, "using libblkid", ["BLKID"]);
 	showitem($output, "using pam", ["PAM"]);
-	print "Using external popt: $output->{EXT_LIB_POPT}->{ENABLE}\n";
+	print "Using external popt: ".lc($output->{EXT_LIB_POPT}->{ENABLE})."\n";
 	print "Using shared libraries internally (experimental): ";
 
 	if ($config->{BLDSHARED} eq "true") {
-- 
cgit