configure: Add --with-modulesdir to accompany --with-libdir.

This starts the seplitting of libdir in to libdir and modulesdir.
Our shared libs should go into libdir, the internal shared modules,
codepages, and other stuff that was originally in libdir, should
go into modulesdir.

The idea behind this is, that in a typical installation,
the shared (and static) libraries (as libtalloc, libsmbclient,
libwbclient and others) should be put into /usr/lib, while
the e.g. the vfs modules should reside in /usr/lib/samba.

This is meant to ease the work of packagers and reduce
the needs for manual interaction and workarounds.

Michael
(This used to be commit b17d1ff646e22c3e979224d119b283fc3af780a8)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3ac09f325f09e2cf097435bba8d188b909570d8f..d92ececbbf007f64cafface7919dfb676e03fb32 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -99,17 +99,18 @@ BINDIR = @bindir@
 SBINDIR = @sbindir@
 ROOTSBINDIR = @rootsbindir@
 LIBDIR = @libdir@
 SBINDIR = @sbindir@
 ROOTSBINDIR = @rootsbindir@
 LIBDIR = @libdir@

+MODULESDIR = @modulesdir@

 INCLUDEDIR=@includedir@
 PAMMODULESDIR = @pammodulesdir@
 INCLUDEDIR=@includedir@
 PAMMODULESDIR = @pammodulesdir@

-VFSLIBDIR = $(LIBDIR)/vfs
-PDBLIBDIR = $(LIBDIR)/pdb
-RPCLIBDIR = $(LIBDIR)/rpc
-IDMAPLIBDIR = $(LIBDIR)/idmap
-NSSINFOLIBDIR = $(LIBDIR)/nss_info
-CHARSETLIBDIR = $(LIBDIR)/charset
-AUTHLIBDIR = $(LIBDIR)/auth
-CONFIGLIBDIR = $(LIBDIR)/config
-GPEXTLIBDIR = $(LIBDIR)/gpext
+VFSLIBDIR = $(MODULESDIR)/vfs
+PDBLIBDIR = $(MODULESDIR)/pdb
+RPCLIBDIR = $(MODULESDIR)/rpc
+IDMAPLIBDIR = $(MODULESDIR)/idmap
+NSSINFOLIBDIR = $(MODULESDIR)/nss_info
+CHARSETLIBDIR = $(MODULESDIR)/charset
+AUTHLIBDIR = $(MODULESDIR)/auth
+CONFIGLIBDIR = $(MODULESDIR)/config
+GPEXTLIBDIR = $(MODULESDIR)/gpext

 CONFIGDIR = @configdir@
 VARDIR = @localstatedir@
 MANDIR = @mandir@
 CONFIGDIR = @configdir@
 VARDIR = @localstatedir@
 MANDIR = @mandir@


@@ -166,6 +167,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
        -DLOCKDIR=\"$(LOCKDIR)\" \
        -DPIDDIR=\"$(PIDDIR)\" \
        -DLIBDIR=\"$(LIBDIR)\" \
        -DLOCKDIR=\"$(LOCKDIR)\" \
        -DPIDDIR=\"$(PIDDIR)\" \
        -DLIBDIR=\"$(LIBDIR)\" \

+       -DMODULESDIR=\"$(MODULESDIR)\" \

        -DLOGFILEBASE=\"$(LOGFILEBASE)\" \
        -DSHLIBEXT=\"@SHLIBEXT@\" \
        -DCTDBDIR=\"$(CTDBDIR)\" \
        -DLOGFILEBASE=\"$(LOGFILEBASE)\" \
        -DSHLIBEXT=\"@SHLIBEXT@\" \
        -DCTDBDIR=\"$(CTDBDIR)\" \


@@ -2541,6 +2543,7 @@ showlayout::
        @echo "  bindir:      $(BINDIR)"
        @echo "  sbindir:     $(SBINDIR)"
        @echo "  libdir:      $(LIBDIR)"
        @echo "  bindir:      $(BINDIR)"
        @echo "  sbindir:     $(SBINDIR)"
        @echo "  libdir:      $(LIBDIR)"

+       @echo "  modulesdir:  $(MODULESDIR)"

        @echo "  vardir:      $(VARDIR)"
        @echo "  mandir:      $(MANDIR)"
        @echo "  privatedir:  $(PRIVATE_DIR)"
        @echo "  vardir:      $(VARDIR)"
        @echo "  mandir:      $(MANDIR)"
        @echo "  privatedir:  $(PRIVATE_DIR)"

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 0537b7a896bf502e34cdc693932e8b680fb1a902..c39efc66f515b7780ae14893879085e741cd738e 100644 (file)
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -22,10 +22,11 @@ test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
 privatedir="\${prefix}/private"
 test "${libdir}" || libdir="\${prefix}/lib"
 logfilebase="\${VARDIR}"
 privatedir="\${prefix}/private"
 test "${libdir}" || libdir="\${prefix}/lib"

+modulesdir="\${LIBDIR}"

 pammodulesdir="\${LIBDIR}/security"
 configdir="\${LIBDIR}"
 swatdir="\${prefix}/swat"
 pammodulesdir="\${LIBDIR}/security"
 configdir="\${LIBDIR}"
 swatdir="\${prefix}/swat"

-codepagedir="\${LIBDIR}"
+codepagedir="\${MODULESDIR}"

 statedir="\${LOCKDIR}"
 cachedir="\${LOCKDIR}"
 
 statedir="\${LOCKDIR}"
 cachedir="\${LOCKDIR}"
 


@@ -39,9 +40,10 @@ AC_ARG_WITH(fhs,
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     test "${libdir}" || libdir="\${prefix}/lib/samba"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     test "${libdir}" || libdir="\${prefix}/lib/samba"

+    modulesdir="\${LIBDIR}"

     configdir="\${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"
     configdir="\${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"

-    codepagedir="\${LIBDIR}"
+    codepagedir="\${MODULESDIR}"

     statedir="\${VARDIR}/lib/samba"
     cachedir="\${VARDIR}/lib/samba"
     AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
     statedir="\${VARDIR}/lib/samba"
     cachedir="\${VARDIR}/lib/samba"
     AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])


@@ -190,6 +192,22 @@ AC_ARG_WITH(libdir,
     ;;
   esac])
 
     ;;
   esac])
 

+#################################################
+# set shared modules (internal lib) directory location
+AC_ARG_WITH(modulesdir,
+[AS_HELP_STRING([--with-modulesdir=DIR], [Where to put shared modules ($libdir)])],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody does it
+  #
+    AC_MSG_WARN([--with-modulesdir without argument - will use default])
+  ;;
+  * )
+    modulesdir="$withval"
+    ;;
+  esac])
+

 #################################################
 # set PAM modules directory location
 AC_ARG_WITH(pammodulesdir,
 #################################################
 # set PAM modules directory location
 AC_ARG_WITH(pammodulesdir,


@@ -236,6 +254,7 @@ AC_SUBST(statedir)
 AC_SUBST(cachedir)
 AC_SUBST(rootsbindir)
 AC_SUBST(pammodulesdir)
 AC_SUBST(cachedir)
 AC_SUBST(rootsbindir)
 AC_SUBST(pammodulesdir)

+AC_SUBST(modulesdir)

 
 #################################################
 # set prefix for 'make test'
 
 #################################################
 # set prefix for 'make test'