configure: use AS_HELP_STRING for --ntp-signd-socket-dir.
[tprouty/samba.git] / source4 / build / m4 / check_path.m4
index d96e2e813090f2c6a224a0774df409943bfa6e0c..3f7c9bd9f074d1a07983924c65e42b66321af670 100644 (file)
@@ -5,32 +5,43 @@ dnl  Released under the GNU GPL
 dnl -------------------------------------------------------
 dnl
 
+AC_LIBREPLACE_LOCATION_CHECKS
+
 #################################################
 # Directory handling stuff to support both the
 # legacy SAMBA directories and FHS compliant
 # ones...
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
+# Defaults and --without-fhs
+logfilebase="${localstatedir}"
+lockdir="${localstatedir}/locks"
+piddir="${localstatedir}/run"
+privatedir="\${prefix}/private"
+modulesdir="\${prefix}/modules"
+winbindd_socket_dir="${localstatedir}/run/winbindd"
+winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged"
+ntp_signd_socket_dir="${localstatedir}/run/ntp_signd"
+
 AC_ARG_WITH(fhs, 
-[  --with-fhs              Use FHS-compliant paths (default=no)],
-    configdir="${sysconfdir}/samba"
-    lockdir="\${localstatedir}/cache/samba"
-    piddir="\${localstatedir}/run/samba"
-    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")
+[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
+    lockdir="${localstatedir}/lib/samba"
+    piddir="${localstatedir}/run/samba"
+    logfilebase="${localstatedir}/log/samba"
+    privatedir="${localstatedir}/lib/samba/private"
+    sysconfdir="${sysconfdir}/samba"
+    modulesdir="${libdir}/samba"
+    datadir="${datadir}/samba"
+    includedir="${includedir}/samba-4.0"
+    ntp_signd_socket_dir="${localstatedir}/run/samba/ntp_signd"
+    winbindd_socket_dir="${localstatedir}/run/samba/winbindd"
+    winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged"
+)
 
 #################################################
 # set private directory location
 AC_ARG_WITH(privatedir,
-[  --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)],
+[AS_HELP_STRING([--with-privatedir=DIR],[Where to put sam.ldb and other private files containing key material ($ac_default_prefix/private)])],
 [ case "$withval" in
   yes|no)
   #
@@ -44,98 +55,122 @@ AC_ARG_WITH(privatedir,
   esac])
 
 #################################################
-# set lock directory location
-AC_ARG_WITH(lockdir,
-[  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)],
+# set where the winbindd socket should be put
+AC_ARG_WITH(winbindd-socket-dir,
+[AS_HELP_STRING([--with-winbindd-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_socket_dir)])],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-lockdir called without argument - will use default])
+    AC_MSG_WARN([--with-winbind-socketdir called without argument - will use default])
   ;;
   * )
-    lockdir="$withval"
+    winbindd_socket_dir="$withval"
     ;;
   esac])
 
 #################################################
-# set pid directory location
-AC_ARG_WITH(piddir,
-[  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)],
+# set where the winbindd privilaged socket should be put
+AC_ARG_WITH(winbindd-privileged-socket-dir,
+[AS_HELP_STRING([--with-winbindd-privileged-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_privileged_socket_dir)])],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-piddir called without argument - will use default])
+    AC_MSG_WARN([--with-winbind-privileged-socketdir called without argument - will use default])
   ;;
   * )
-    piddir="$withval"
+    winbindd_privileged_socket_dir="$withval"
     ;;
   esac])
 
 #################################################
-# set configuration directory location
-AC_ARG_WITH(configdir,
-[  --with-configdir=DIR    Where to put configuration files (\$libdir)],
+# set where the NTP signing deamon socket should be put
+AC_ARG_WITH(ntp-signd-socket-dir,
+[AS_HELP_STRING([--with-ntp-signd-socket-dir=DIR],[Where to put the NTP signing deamon socket ($ac_default_prefix/run/ntp_signd)])],
 [ case "$withval" in
   yes|no)
   #
-  # Just in case anybody does it
+  # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-configdir called without argument - will use default])
+    AC_MSG_WARN([--with-ntp-signd-socketdir called without argument - will use default])
   ;;
   * )
-    configdir="$withval"
+    ntp_signd_socket_dir="$withval"
     ;;
   esac])
 
 #################################################
-# set log directory location
-AC_ARG_WITH(logfilebase,
-[  --with-logfilebase=DIR  Where to put log files (\$(VARDIR))],
+# set lock directory location
+AC_ARG_WITH(lockdir,
+[  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)],
 [ case "$withval" in
   yes|no)
   #
-  # Just in case anybody does it
+  # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-logfilebase called without argument - will use default])
+    AC_MSG_WARN([--with-lockdir called without argument - will use default])
   ;;
   * )
-    logfilebase="$withval"
+    lockdir="$withval"
     ;;
   esac])
 
+#################################################
+# set pid directory location
+AC_ARG_WITH(piddir,
+[  --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-piddir called without argument - will use default])
+  ;;
+  * )
+    piddir="$withval"
+    ;;
+  esac])
 
 #################################################
-# set swat directory location
-AC_ARG_WITH(swatdir,
-[  --with-swatdir=DIR    Where to put configuration files (\$swatdir)],
+# set log directory location
+AC_ARG_WITH(logfilebase,
+[  --with-logfilebase=DIR  Where to put log files (\$(VARDIR))],
 [ case "$withval" in
   yes|no)
-    AC_MSG_WARN([--with-swatdir called without argument - will use default])
+  #
+  # Just in case anybody does it
+  #
+    AC_MSG_WARN([--with-logfilebase called without argument - will use default])
   ;;
   * )
-    swatdir="$withval"
+    logfilebase="$withval"
     ;;
   esac])
 
-AC_SUBST(configdir)
+
 AC_SUBST(lockdir)
 AC_SUBST(piddir)
 AC_SUBST(logfilebase)
 AC_SUBST(privatedir)
 AC_SUBST(bindir)
 AC_SUBST(sbindir)
-AC_SUBST(swatdir)
+AC_SUBST(winbindd_socket_dir)
+AC_SUBST(winbindd_privileged_socket_dir)
+AC_SUBST(ntp_signd_socket_dir)
+AC_SUBST(modulesdir)
 
 #################################################
 # set prefix for 'make test'
-selftest_prefix="./"
+# this is needed to workarround the 108 char 
+# unix socket path limitation!
+#
+selftest_prefix="./st"
 AC_SUBST(selftest_prefix)
 AC_ARG_WITH(selftest-prefix,
-[  --with-selftest-prefix=DIR    The prefix where make test will be runned (\$selftest_prefix)],
+[  --with-selftest-prefix=DIR    The prefix where make test will be run ($selftest_prefix)],
 [ case "$withval" in
   yes|no)
     AC_MSG_WARN([--with-selftest-prefix called without argument - will use default])
@@ -145,68 +180,28 @@ AC_ARG_WITH(selftest-prefix,
     ;;
   esac])
 
-developer=no
-AC_SUBST(developer)
-AC_ARG_ENABLE(developer, [  --enable-developer      Turn on developer warnings and debugging (default=no)],
-    [if test x$enable_developer = xyes; then
-       debug=yes
-       CFLAGS="${CFLAGS} -g -Wall"
-        developer=yes
-       DEVELOPER_CFLAGS="-Wshadow -Werror-implicit-function-declaration -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wdeclaration-after-statement -Wmissing-format-attribute -Wformat=2 -Wno-format-y2k -DDEBUG_PASSWORD -DDEVELOPER"
-    fi])
-
 debug=no
-AC_ARG_ENABLE(debug, 
+AC_ARG_ENABLE(debug,
 [  --enable-debug          Turn on compiler debugging information (default=no)],
-    [if test x$enable_debug = xyes -a x$enable_developer != xyes; then
+    [if test x$enable_debug = xyes; then
         debug=yes
-       CFLAGS="${CFLAGS} -g"
     fi])
 
-
-experimental=no
-AC_ARG_ENABLE(experimental, [  --enable-experimental Turn on experimental features (default=no)],
-    [if eval "test x$enable_experimental = xyes"; then
-        experimental=yes
+developer=no
+AC_SUBST(developer)
+AC_ARG_ENABLE(developer,
+[  --enable-developer      Turn on developer warnings and debugging (default=no)],
+    [if test x$enable_developer = xyes; then
+       debug=yes
+        developer=yes
     fi])
 
-
 dnl disable these external libs 
 AC_ARG_WITH(disable-ext-lib,
 [  --with-disable-ext-lib=LIB Comma-seperated list of external libraries],
 [ if test $withval; then
        for i in `echo $withval | sed -e's/,/ /g'`
        do
-               eval SMB_EXT_LIB_$i=NO
-       done
-fi ])
-
-dnl exclude these modules 
-AC_ARG_WITH(exclude-modules,
-[  --with-exclude-modules=MODULES Comma-seperated list of names of modules to exclude from build],
-[ if test $withval; then
-       for i in `echo $withval | sed -e's/,/ /g'`
-       do
-               eval SMB_MODULE_$i=NOT
-       done
-fi ])
-
-dnl Always built these modules shared
-AC_ARG_WITH(shared-modules,
-[  --with-shared-modules=MODULES  Comma-seperated list of names of modules to build shared],
-[ if test $withval; then
-       for i in `echo $withval | sed -e's/,/ /g'`
-       do
-               eval SMB_MODULE_$i=SHARED
-       done
-fi ])
-
-dnl Always built these modules static
-AC_ARG_WITH(static-modules,
-[  --with-static-modules=MODULES  Comma-seperated list of names of modules to statically link in],
-[ if test $withval; then
-       for i in `echo $withval | sed -e's/,/ /g'`
-       do
-               eval SMB_MODULE_$i=STATIC
+               eval SMB_$i=NO
        done
 fi ])