svn commit: samba r13152 - in branches/SAMBA_4_0/source/build/m4: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-26 05:05:26 +0000 (Thu, 26 Jan 2006)
New Revision: 13152

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

Log:
Jelmer assures me that this won't break anything, but does make it
much clearer where things go.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/build/m4/check_path.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_path.m4	2006-01-26 03:14:03 UTC (rev 13151)
+++ branches/SAMBA_4_0/source/build/m4/check_path.m4	2006-01-26 05:05:26 UTC (rev 13152)
@@ -11,6 +11,14 @@
 # ones...
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
+# Defaults and --without-fhs
+    configdir="\${LIBDIR}"
+    logfilebase="\${localstatedir}"
+    lockdir="\${localstatedir}/locks"
+    piddir="\${localstatedir}/locks"
+    privatedir="\${prefix}/private"
+    swatdir="\${prefix}/swat"
+
 AC_ARG_WITH(fhs, 
 [  --with-fhs              Use FHS-compliant paths (default=no)],
     configdir="${sysconfdir}/samba"
@@ -19,13 +27,7 @@
     logfilebase="\${localstatedir}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     libdir="\${prefix}/lib/samba"
-    swatdir="\${datadir}/samba/swat",
-    configdir="\${LIBDIR}"
-    logfilebase="\${localstatedir}"
-    lockdir="\${localstatedir}/locks"
-    piddir="\${localstatedir}/locks"
-    privatedir="\${prefix}/private"
-    swatdir="\${prefix}/swat")
+    swatdir="\${datadir}/samba/swat")
 
 #################################################
 # set private directory location