r14626: Only set libdir and mandir to the defaults if we haven't used --libdir

or --mandir to set them already.  Till now we overwrrote a setting made
with --libdir or --mandir.
(This used to be commit 94980a15be5eae2820c340d3d33b6c9df7053b24)

diff --git a/source3/configure.in b/source3/configure.in
index 4b883a28ac003a7653f6999e47657bdb1a24f98c..a5dc7a483f18e0c1efcfe44ef1a9a3f260599108 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -25,10 +25,10 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
 rootsbindir="\${SBINDIR}"
 lockdir="\${VARDIR}/locks"
 piddir="\${VARDIR}/locks"
-mandir="\${prefix}/man"
+test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
 privatedir="\${prefix}/private"
-libdir="\${prefix}/lib"
+test "${libdir}" || libdir="\${prefix}/lib"
 configdir="\${LIBDIR}"
 swatdir="\${prefix}/swat"