[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3748-g03de8c1

[Michael Adam]

The branch, v3-devel has been updated
       via  03de8c1955a85f2e3e9f947309e09023138a1591 (commit)
       via  256977cf05cb4c4073ece1389a7e4939b18f5f13 (commit)
       via  c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d (commit)
      from  81030e49ce344260d279a3112b13a21ce3520748 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit 03de8c1955a85f2e3e9f947309e09023138a1591
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 15:55:17 2008 +0200

    configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default with-fhs.
    
    This is what one actually wants:
    Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba.
    
    Michael

commit 256977cf05cb4c4073ece1389a7e4939b18f5f13
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 14:38:41 2008 +0200

    configure: use ${libdir} instead of \${LIBDIR}.
    
    Now after removing --with-libdir, the value of ${libdir} won't change
    anymore at that stage, so there is no need to have the variable expansion
    deferred to "make".
    
    Michael

commit c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 15 14:35:46 2008 +0200

    configure: remove the --with-libdir parameter.
    
    This is redundant: use the autoconf-provided --libdir instead.
    This will also make the new distinction between libdir and modulesdir
    more visible.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/m4/check_path.m4 |   26 +++++---------------------
 1 files changed, 5 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/m4/check_path.m4 b/source/m4/check_path.m4
index c39efc6..7aa8c21 100644
--- a/source/m4/check_path.m4
+++ b/source/m4/check_path.m4
@@ -22,9 +22,9 @@ test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
 privatedir="\${prefix}/private"
 test "${libdir}" || libdir="\${prefix}/lib"
-modulesdir="\${LIBDIR}"
-pammodulesdir="\${LIBDIR}/security"
-configdir="\${LIBDIR}"
+modulesdir="${libdir}"
+pammodulesdir="${libdir}/security"
+configdir="${libdir}"
 swatdir="\${prefix}/swat"
 codepagedir="\${MODULESDIR}"
 statedir="\${LOCKDIR}"
@@ -39,8 +39,8 @@ AC_ARG_WITH(fhs,
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
-    test "${libdir}" || libdir="\${prefix}/lib/samba"
-    modulesdir="\${LIBDIR}"
+    test "${libdir}" || libdir="\${prefix}/lib"
+    modulesdir="${libdir}/samba"
     configdir="\${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"
     codepagedir="\${MODULESDIR}"
@@ -177,22 +177,6 @@ AC_ARG_WITH(ctdb,
   esac])
 
 #################################################
-# set lib directory location
-AC_ARG_WITH(libdir,
-[AS_HELP_STRING([--with-libdir=DIR], [Where to put libdir ($libdir)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody does it
-  #
-    AC_MSG_WARN([--with-libdir without argument - will use default])
-  ;;
-  * )
-    libdir="$withval"
-    ;;
-  esac])
-
-#################################################
 # set shared modules (internal lib) directory location
 AC_ARG_WITH(modulesdir,
 [AS_HELP_STRING([--with-modulesdir=DIR], [Where to put shared modules ($libdir)])],


-- 
Samba Shared Repository