Changeset 745 for trunk/server/source3/m4

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/m4/aclocal.m4 (modified) (5 diffs)
• source3/m4/check_path.m4 (modified) (3 diffs)
• source3/m4/samba_version.m4 (modified) (1 diff)

trunk/server/source3/m4/aclocal.m4

@@ -33 +33 @@
         elif test x"$DEST" = xSTATIC; then
                 [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z])  $1_init();"
-                [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);"
+                [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);"
                 string_static_modules="$string_static_modules $1"
                 $4_STATIC="$$4_STATIC $2"
@@ -55 +55 @@
 
 
-dnl SMB_LIBRARY(name, version, default, reason)
+dnl SMB_LIBRARY(name, soversion, fullversion, default, reason)
 dnl
 dnl configure build and use of an (internal) shared library
@@ -75 +75 @@
 
 m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
+m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
 
 AC_SUBST(LIBUC[_SHARED_TARGET])
@@ -85 +86 @@
 AC_SUBST([UNINSTALL_]LIBUC)
 AC_SUBST(LIBUC[_SOVER])
+AC_SUBST(LIBUC[_FULLVER])
 
 AC_MSG_CHECKING([whether to build the LIBNAME shared library])
-m4_if([$3], [no], [
+m4_if([$4], [no], [
 dnl set the default to not build the shared lib
 AC_ARG_WITH(LIBNAME,
 AS_HELP_STRING([--with-]LIBNAME,
-        m4_if([$4], [],
+        m4_if([$5], [],
                 [Build the LIBNAME shared library (default=no)],
-                [Build the LIBNAME shared library (default=no ($4))])),
+                [Build the LIBNAME shared library (default=no ($5))])),
 [
 case "$withval" in
@@ -792 +794 @@
 ])
 
-dnl SMB_CHECK_CLOCK_ID(clockid)
-dnl Test whether the specified clock_gettime clock ID is available. If it
-dnl is, we define HAVE_clockid
-AC_DEFUN([SMB_CHECK_CLOCK_ID],
-[
-    AC_MSG_CHECKING(for $1)
-    AC_TRY_LINK([
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-    ],
-    [
-clockid_t clk = $1;
-    ],
-    [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_$1, 1,
-            [Whether the clock_gettime clock ID $1 is available])
-    ],
-    [
-        AC_MSG_RESULT(no)
-    ])
-])
-
 dnl SMB_IF_RTSIGNAL_BUG([actions if true],
 dnl                     [actions if false],

trunk/server/source3/m4/check_path.m4

@@ -20 +20 @@
 piddir="\${VARDIR}/locks"
 ncalrpcdir="\${VARDIR}/ncalrpc"
+nmbdsocketdir="\${VARDIR}/nmbd"
 test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
@@ -167 +168 @@
 
 #################################################
+# set nmbd socket directory location
+AC_ARG_WITH(nmbdsocketdir,
+[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory ($ac_default_prefix/var/nmbd)])],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-nmbdsocketdir called without argument - will use default])
+  ;;
+  * )
+    nmbdsocketdir="$withval"
+    ;;
+  esac])
+
+#################################################
 # set SWAT directory location
 AC_ARG_WITH(swatdir,
@@ -299 +316 @@
 AC_SUBST(lockdir)
 AC_SUBST(piddir)
+AC_SUBST(nmbdsocketdir)
 AC_SUBST(ncalrpcdir)
 AC_SUBST(logfilebase)

trunk/server/source3/m4/samba_version.m4

@@ -16 +16 @@
         echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
 fi
-SAMBA_VERSION_GIT_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then
-        echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}"
+SAMBA_VERSION_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_DATE' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_COMMIT_DATE}";then
+        echo "BUILD COMMIT DATE: ${SAMBA_VERSION_COMMIT_DATE}"
 fi
-SAMBA_VERSION_GIT_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then
-        echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
+SAMBA_VERSION_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_TIME' | cut -d ' ' -f3-`
+if test -n "${SAMBA_VERSION_COMMIT_TIME}";then
+        echo "BUILD COMMIT TIME: ${SAMBA_VERSION_COMMIT_TIME}"
 
         # just to keep the build-farm gui happy for now...
-        echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}"
+        echo "BUILD REVISION: ${SAMBA_VERSION_COMMIT_TIME}"
 fi