build: Remove autoconf build system

We are now confident that that waf build system meets enough of our needs
that we will work to improve it, rather than maintain two build systems.

Andrew Bartlett

Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

Reviewed-by: David Disseldorp <ddiss@samba.org>

4 files changed, 0 insertions, 1253 deletions

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
deleted file mode 100644
index 5d9ce30144..0000000000
--- a/source3/m4/aclocal.m4
+++ /dev/null
@@ -1,899 +0,0 @@
-dnl test whether dirent has a d_off member
-AC_DEFUN(AC_DIRENT_D_OFF,
-[AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
-[AC_TRY_COMPILE([
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>], [struct dirent d; d.d_off;],
-ac_cv_dirent_d_off=yes, ac_cv_dirent_d_off=no)])
-if test $ac_cv_dirent_d_off = yes; then
-  AC_DEFINE(HAVE_DIRENT_D_OFF,1,[Whether dirent has a d_off member])
-fi
-])
-
-dnl Mark specified module as shared
-dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
-AC_DEFUN(SMB_MODULE,
-[
-	AC_MSG_CHECKING([how to build $1])
-	if test "$[MODULE_][$1]"; then
-		DEST=$[MODULE_][$1]
-	elif test "$[MODULE_]translit([$4], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
-		DEST=$[MODULE_]translit([$4], [A-Z], [a-z])
-	else
-		DEST=$[MODULE_DEFAULT_][$1]
-	fi
-	
-	if test x"$DEST" = xSHARED; then
-		AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module])
-		$4_MODULES="$$4_MODULES $3"
-		AC_MSG_RESULT([shared])
-		[$6]
-		string_shared_modules="$string_shared_modules $1"
-	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);"
-		string_static_modules="$string_static_modules $1"
-		$4_STATIC="$$4_STATIC $2"
-		AC_SUBST($4_STATIC)
-		[$5]
-		AC_MSG_RESULT([static])
-	else
-	    string_ignored_modules="$string_ignored_modules $1"
-		AC_MSG_RESULT([not])
-	fi
-])
-
-AC_DEFUN(SMB_SUBSYSTEM,
-[
-	AC_SUBST($1_STATIC)
-	AC_SUBST($1_MODULES)
-	AC_DEFINE_UNQUOTED([static_init_]translit([$1], [A-Z], [a-z]), [{$init_static_modules_]translit([$1], [A-Z], [a-z])[}], [Static init functions])
-	AC_DEFINE_UNQUOTED([static_decl_]translit([$1], [A-Z], [a-z]), [$decl_static_modules_]translit([$1], [A-Z], [a-z]), [Decl of Static init functions])
-    	ifelse([$2], , :, [rm -f $2])
-])
-
-
-dnl SMB_LIBRARY(name, soversion, fullversion, default, reason)
-dnl
-dnl configure build and use of an (internal) shared library
-dnl
-AC_DEFUN([SMB_LIBRARY],
-[
-m4_pushdef([LIBNAME], [lib$1])
-m4_pushdef([LIBUC], [m4_toupper(LIBNAME)])
-m4_pushdef([LIBLIBS], [-l$1])
-
-LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT
-LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
-LIBUC[_SHARED]=
-LIBUC[_STATIC]=
-LIBUC[_LIBS]=LIBLIBS
-LIBUC[_TARGET]=
-[INSTALL_]LIBUC=
-[UNINSTALL_]LIBUC=
-
-m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
-m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
-
-LIBUC[_SHARED_TARGET_SOVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_SOVER]
-LIBUC[_SHARED_TARGET_FULLVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_FULLVER]
-
-AC_SUBST(LIBUC[_SHARED_TARGET])
-AC_SUBST(LIBUC[_STATIC_TARGET])
-AC_SUBST(LIBUC[_SHARED])
-AC_SUBST(LIBUC[_STATIC])
-AC_SUBST(LIBUC[_LIBS])
-AC_SUBST(LIBUC[_TARGET])
-AC_SUBST([INSTALL_]LIBUC)
-AC_SUBST([UNINSTALL_]LIBUC)
-AC_SUBST(LIBUC[_SOVER])
-AC_SUBST(LIBUC[_FULLVER])
-AC_SUBST(LIBUC[_SHARED_TARGET_SOVER])
-AC_SUBST(LIBUC[_SHARED_TARGET_FULLVER])
-
-AC_MSG_CHECKING([whether to build the LIBNAME shared library])
-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([$5], [],
-		[Build the LIBNAME shared library (default=no)],
-		[Build the LIBNAME shared library (default=no ($5))])),
-[
-case "$withval" in
-	yes)
-		build_lib=yes
-		;;
-	*)
-		AC_MSG_RESULT(no)
-		build_lib=no
-		;;
-esac
-],
-[
-# if unspecified, default is not to build
-AC_MSG_RESULT(no)
-build_lib=no
-]
-)
-],[
-dnl by default, try to build the shared lib
-AC_ARG_WITH(LIBNAME,
-AS_HELP_STRING([--with-]LIBNAME,
-	[Build the LIBNAME shared library (default=yes if shared libs supported)]),
-[
-case "$withval" in
-	no)
-		AC_MSG_RESULT(no)
-		build_lib=no
-		;;
-	*)
-		build_lib=yes
-		;;
-esac
-],
-[
-# if unspecified, default is to build it if possible.
-build_lib=yes
-]
-)
-])
-
-if eval test x"$build_lib" = "xyes" ; then
-	# only set the install targets if the user chose the library
-	[INSTALL_]LIBUC=[install]LIBNAME
-	[UNINSTALL_]LIBUC=[uninstall]LIBNAME
-	if eval $BLDSHARED = true; then
-		LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
-		LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
-
-		AC_MSG_RESULT(yes)
-		if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
-			enable_static=yes
-			LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-			LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
-		else
-			LIBUC[_LIBS]=LIBLIBS
-		fi
-	else
-		enable_static=yes
-		LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-		LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
-		AC_MSG_RESULT(no shared library support -- will supply static library)
-	fi
-else
-	enable_static=yes
-	AC_MSG_RESULT(shared library not selected, but will supply static library)
-fi
-if test $enable_static = yes; then
-	LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
-fi
-
-m4_popdef([LIBNAME])
-m4_popdef([LIBUC])
-m4_popdef([LIBLIBS])
-
-])
-
-
-dnl AC_LIBTESTFUNC(lib, function, [actions if found], [actions if not found])
-dnl Check for a function in a library, but don't keep adding the same library
-dnl to the LIBS variable.  Check whether the function is available in the
-dnl current LIBS before adding the library which prevents us spuriously
-dnl adding libraries for symbols that are in libc.
-dnl
-dnl On success, the default actions ensure that HAVE_FOO is defined. The lib
-dnl is always added to $LIBS if it was found to be necessary. The caller
-dnl can use SMB_REMOVE_LIB to strp this if necessary.
-AC_DEFUN([AC_LIBTESTFUNC],
-[
-  AC_CHECK_FUNCS($2,
-      [
-        # $2 was found in libc or existing $LIBS
-	m4_ifval([$3],
-	    [
-		$3
-	    ],
-	    [
-		AC_DEFINE(translit([HAVE_$2], [a-z], [A-Z]), 1,
-		    [Whether $2 is available])
-	    ])
-      ],
-      [
-        # $2 was not found, try adding lib$1
-	case " $LIBS " in
-          *\ -l$1\ *)
-	    m4_ifval([$4],
-		[
-		    $4
-		],
-		[
-		    # $2 was not found and we already had lib$1
-		    # nothing to do here by default
-		    true
-		])
-	    ;;
-          *)
-	    # $2 was not found, try adding lib$1
-	    AC_CHECK_LIB($1, $2,
-	      [
-		LIBS="-l$1 $LIBS"
-		m4_ifval([$3],
-		    [
-			$3
-		    ],
-		    [
-			AC_DEFINE(translit([HAVE_$2], [a-z], [A-Z]), 1,
-			    [Whether $2 is available])
-		    ])
-	      ],
-	      [
-		m4_ifval([$4],
-		    [
-			$4
-		    ],
-		    [
-			# $2 was not found in lib$1
-			# nothing to do here by default
-			true
-		    ])
-	      ])
-	  ;;
-        esac
-      ])
-])
-
-# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
-#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
-# ------------------------------------------------------
-#
-# Use a cache variable name containing both the library and function name,
-# because the test really is for library $1 defining function $3, not
-# just for library $1.  Separate tests with the same $1 and different $3s
-# may have different results.
-#
-# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
-# is asking for trouble, since AC_CHECK_LIB($lib, fun) would give
-# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-# the AS_LITERAL_IF indirection.
-#
-# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
-# whatever the FUNCTION, in addition to not being a *S macro.  Note
-# that the cache does depend upon the function we are looking for.
-#
-# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
-# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
-# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-# freedom.
-AC_DEFUN([AC_CHECK_LIB_EXT],
-[
-AH_CHECK_LIB_EXT([$1])
-ac_check_lib_ext_save_LIBS=$LIBS
-LIBS="-l$1 $$2 $7 $LIBS"
-AS_LITERAL_IF([$1],
-      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
-      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
-
-m4_ifval([$3],
- [
-    AH_CHECK_FUNC_EXT([$3])
-    AS_LITERAL_IF([$1],
-              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
-              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
-    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
-	[AC_TRY_LINK_FUNC($3,
-                 [AS_VAR_SET(ac_Lib_func, yes);
-		  AS_VAR_SET(ac_Lib_ext, yes)],
-                 [AS_VAR_SET(ac_Lib_func, no);
-		  AS_VAR_SET(ac_Lib_ext, no)])
-	])
-    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
-        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
-    AS_VAR_POPDEF([ac_Lib_func])dnl
- ],[
-    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
-	[AC_TRY_LINK_FUNC([main],
-                 [AS_VAR_SET(ac_Lib_ext, yes)],
-                 [AS_VAR_SET(ac_Lib_ext, no)])
-	])
- ])
-LIBS=$ac_check_lib_ext_save_LIBS
-
-AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
-    [m4_default([$4], 
-        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-		case "$$2" in
-		    *-l$1*)
-			;;
-		    *)
-			$2="-l$1 $$2"
-			;;
-		esac])
-		[$6]
-	    ],
-	    [$5])dnl
-AS_VAR_POPDEF([ac_Lib_ext])dnl
-])# AC_CHECK_LIB_EXT
-
-# AH_CHECK_LIB_EXT(LIBNAME)
-# ---------------------
-m4_define([AH_CHECK_LIB_EXT],
-[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
-
-# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -----------------------------------------------------------------
-dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
-dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
-AC_DEFUN([AC_CHECK_FUNC_EXT],
-[
-    AH_CHECK_FUNC_EXT($1)	
-    ac_check_func_ext_save_LIBS=$LIBS
-    LIBS="$2 $LIBS"
-    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
-    AC_CACHE_CHECK([for $1], ac_var,
-	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
-                [AS_VAR_SET(ac_var, yes)],
-                [AS_VAR_SET(ac_var, no)])])
-    LIBS=$ac_check_func_ext_save_LIBS
-    AS_IF([test AS_VAR_GET(ac_var) = yes], 
-	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
-	    [$4])dnl
-AS_VAR_POPDEF([ac_var])dnl
-])# AC_CHECK_FUNC_EXT
-
-# AH_CHECK_FUNC_EXT(FUNCNAME)
-# ---------------------
-m4_define([AH_CHECK_FUNC_EXT],
-[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
-             [Define to 1 if you have the `]$1[' function.])])
-
-dnl Define an AC_DEFINE with ifndef guard.
-dnl AC_N_DEFINE(VARIABLE [, VALUE])
-define(AC_N_DEFINE,
-[cat >> confdefs.h <<\EOF
-[#ifndef] $1
-[#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-[#endif]
-EOF
-])
-
-dnl Add an #include
-dnl AC_ADD_INCLUDE(VARIABLE)
-define(AC_ADD_INCLUDE,
-[cat >> confdefs.h <<\EOF
-[#include] $1
-EOF
-])
-
-dnl Copied from libtool.m4
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker used by compiler is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $CC -Wl,-v /dev/null 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-dnl Removes -I/usr/include/? from given variable
-AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-  ac_new_flags=""
-  for i in [$]$1; do
-    case [$]i in
-    -I/usr/include|-I/usr/include/) ;;
-    *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-    esac
-  done
-  $1=[$]ac_new_flags
-])
-
-dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
-dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
-AC_DEFUN(LIB_REMOVE_USR_LIB,[
-  ac_new_flags=""
-  l=""
-  for i in [$]$1; do
-    case [$]l[$]i in
-    -L/usr/lib) ;;
-    -L/usr/lib/) ;;
-    -L/usr/lib64) ;;
-    -L/usr/lib64/) ;;
-    -Wl,-rpath,/usr/lib) l="";;
-    -Wl,-rpath,/usr/lib/) l="";;
-    -Wl,-rpath,/usr/lib64) l="";;
-    -Wl,-rpath,/usr/lib64/) l="";;
-    -Wl,-rpath) l=[$]i;;
-    -Wl,-rpath-Wl,/usr/lib) l="";;
-    -Wl,-rpath-Wl,/usr/lib/) l="";;
-    -Wl,-rpath-Wl,/usr/lib64) l="";;
-    -Wl,-rpath-Wl,/usr/lib64/) l="";;
-    -rpath=/usr/lib:*) l="-rpath=${i#-rpath=*:}";;
-    *)
-    	s=" "
-        if test x"[$]ac_new_flags" = x""; then
-            s="";
-	fi
-        if test x"[$]l" = x""; then
-            ac_new_flags="[$]ac_new_flags[$]s[$]i";
-        else
-            ac_new_flags="[$]ac_new_flags[$]s[$]l [$]i";
-        fi
-        l=""
-        ;;
-    esac
-  done
-  $1=[$]ac_new_flags
-])
-
-dnl From Bruno Haible.
-
-AC_DEFUN(jm_ICONV,
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable libiconv installed).
-  AC_MSG_CHECKING(for iconv in $1)
-    jm_cv_func_iconv="no"
-    jm_cv_lib_iconv=""
-    jm_cv_giconv=no
-    jm_save_LIBS="$LIBS"
-
-  dnl Check for include in giconv.h but no lib needed
-  if test "$jm_cv_func_iconv" != yes; then
-    AC_TRY_LINK([#include <stdlib.h>
-#include <giconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-       jm_cv_func_iconv=yes
-       jm_cv_include="giconv.h"
-       jm_cv_giconv="yes"
-       jm_cv_lib_iconv="")
-
-    dnl Standard iconv.h include, lib in glibc or libc ...
-    if test "$jm_cv_func_iconv" != yes; then
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-         jm_cv_include="iconv.h"
-         jm_cv_func_iconv=yes
-         jm_cv_lib_iconv="")
-
-      dnl Include in giconv.h, libgiconv needed to link
-      if test "$jm_cv_func_iconv" != yes; then
-        jm_save_LIBS="$LIBS"
-        LIBS="$LIBS -lgiconv"
-        AC_TRY_LINK([#include <stdlib.h>
-#include <giconv.h>],
-          [iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);],
-          jm_cv_lib_iconv=yes
-          jm_cv_func_iconv=yes
-          jm_cv_include="giconv.h"
-          jm_cv_giconv=yes
-          jm_cv_lib_iconv="giconv")
-
-        LIBS="$jm_save_LIBS"
-
-        dnl Include in iconv.h, libiconv needed to link
-        if test "$jm_cv_func_iconv" != yes; then
-          jm_save_LIBS="$LIBS"
-          LIBS="$LIBS -liconv"
-          AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-            [iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);],
-            jm_cv_include="iconv.h"
-            jm_cv_func_iconv=yes
-            jm_cv_lib_iconv="iconv")
-          LIBS="$jm_save_LIBS"
-
-          dnl Include in biconv.h, libbiconv needed to link
-          if test "$jm_cv_func_iconv" != yes; then
-            jm_save_LIBS="$LIBS"
-            LIBS="$LIBS -lbiconv"
-            AC_TRY_LINK([#include <stdlib.h>
-#include <biconv.h>],
-              [iconv_t cd = iconv_open("","");
-               iconv(cd,NULL,NULL,NULL,NULL);
-               iconv_close(cd);],
-              jm_cv_lib_iconv=yes
-              jm_cv_func_iconv=yes
-              jm_cv_include="biconv.h"
-              jm_cv_biconv=yes
-              jm_cv_lib_iconv="biconv")
-
-            LIBS="$jm_save_LIBS"
-          fi
-        fi
-      fi
-    fi
-  fi
-  if test "$jm_cv_func_iconv" = yes; then
-    if test "$jm_cv_giconv" = yes; then
-      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-      AC_MSG_RESULT(yes)
-      ICONV_FOUND=yes
-    else
-      if test "$jm_cv_biconv" = yes; then
-        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
-        AC_MSG_RESULT(yes)
-        ICONV_FOUND=yes
-      else 
-        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-        AC_MSG_RESULT(yes)
-        ICONV_FOUND=yes
-      fi
-    fi
-  else
-    AC_MSG_RESULT(no)
-  fi
-])
-
-AC_DEFUN(rjs_CHARSET,[
-  dnl Find out if we can convert from $1 to UCS2-LE
-  AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
-  AC_TRY_RUN([
-#include <$jm_cv_include>
-main(){
-    iconv_t cd = iconv_open("$1", "UCS-2LE");
-    if (cd == 0 || cd == (iconv_t)-1) {
-	return -1;
-    }
-    return 0;
-}
-  ],ICONV_CHARSET=$1,ICONV_CHARSET=no,ICONV_CHARSET=cross)
-  AC_MSG_RESULT($ICONV_CHARSET)
-])
-
-dnl AC_ENABLE_SHARED - implement the --enable-shared flag
-dnl Usage: AC_ENABLE_SHARED[(DEFAULT)]
-dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-dnl   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]    build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-dnl AC_ENABLE_STATIC - implement the --enable-static flag
-dnl Usage: AC_ENABLE_STATIC[(DEFAULT)]
-dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-dnl   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]    build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-dnl AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-dnl AC_TRY_COMMAND_NO_STDERR - also fail if there is output on stderr
-AC_DEFUN( [AC_TRY_COMMAND_NO_STDERR],
-[
-	{ OUT=`($1) 3>&AS_MESSAGE_LOG_FD 2>&1 1>&3`
-	RC=$?
-	echo "\$?=$RC" >&AS_MESSAGE_LOG_FD
-	if test x"$OUT" != x ; then
-		echo "stderr:" >&AS_MESSAGE_LOG_FD
-		echo "$OUT" >&AS_MESSAGE_LOG_FD
-	fi
-	test $RC -eq 0 -a x"$OUT" = x ; }
-])
-
-dnl AC_TRY_RUN_STRICT(PROGRAM,CFLAGS,CPPFLAGS,LDFLAGS,
-dnl		[ACTION-IF-TRUE],[ACTION-IF-FALSE],
-dnl		[ACTION-IF-CROSS-COMPILING = RUNTIME-ERROR])
-AC_DEFUN( [AC_TRY_RUN_STRICT],
-[
-	old_CFLAGS="$CFLAGS";
-	CFLAGS="$2";
-	export CFLAGS;
-	old_CPPFLAGS="$CPPFLAGS";
-	CPPFLAGS="$3";
-	export CPPFLAGS;
-	old_LDFLAGS="$LDFLAGS";
-	LDFLAGS="$4";
-	export LDFLAGS;
-	AC_TRY_RUN([$1],[$5],[$6],[$7])
-	CFLAGS="$old_CFLAGS";
-	old_CFLAGS="";
-	export CFLAGS;
-	CPPFLAGS="$old_CPPFLAGS";
-	old_CPPFLAGS="";
-	export CPPFLAGS;
-	LDFLAGS="$old_LDFLAGS";
-	old_LDFLAGS="";
-	export LDFLAGS;
-])
-
-dnl SMB_CHECK_SYSCONF(varname)
-dnl Tests whether the sysconf(3) variable "varname" is available.
-AC_DEFUN([SMB_CHECK_SYSCONF],
-[
-    AC_CACHE_CHECK([for sysconf($1)],
-	samba_cv_SYSCONF$1,
-	[
-	    AC_TRY_LINK([#include <unistd.h>],
-		[ return sysconf($1) == -1 ? 1 : 0; ],
-		[ samba_cv_SYSCONF$1=yes ],
-		[ samba_cv_SYSCONF$1=no ])
-	])
-
-    if test x"$samba_cv_SYSCONF$1" = x"yes" ; then
-	AC_DEFINE(SYSCONF$1, 1, [Whether sysconf($1) is available])
-    fi
-])
-
-dnl SMB_IS_LIBPTHREAD_LINKED([actions if true], [actions if false])
-dnl Test whether the current LIBS results in libpthread being present.
-dnl Execute the corresponding user action list.
-AC_DEFUN([SMB_IS_LIBPTHREAD_LINKED],
-[
-    AC_MSG_CHECKING(if libpthread is linked)
-    AC_TRY_LINK([],
-	[return pthread_create(0, 0, 0, 0);],
-	[
-	    AC_MSG_RESULT(yes)
-	    $1
-	],
-	[
-	    AC_MSG_RESULT(no)
-	    $2
-	])
-])
-
-dnl SMB_REMOVE_LIB(lib)
-dnl Remove the given library from $LIBS
-AC_DEFUN([SMB_REMOVE_LIB],
-[
-    LIBS=`echo $LIBS | sed '-es/-l$1//g'`
-])
-
-dnl SMB_CHECK_DMAPI([actions if true], [actions if false])
-dnl Check whether DMAPI is available and is a version that we know
-dnl how to deal with. The default truth action is to set samba_dmapi_libs
-dnl to the list of necessary libraries, and to define USE_DMAPI.
-AC_DEFUN([SMB_CHECK_DMAPI],
-[
-    samba_dmapi_libs=""
-
-    if test x"$samba_dmapi_libs" = x"" ; then
-	AC_CHECK_LIB(dm, dm_get_eventlist,
-		[ samba_dmapi_libs="-ldm"], [])
-    fi
-
-    if test x"$samba_dmapi_libs" = x"" ; then
-	AC_CHECK_LIB(jfsdm, dm_get_eventlist,
-		[samba_dmapi_libs="-ljfsdm"], [])
-    fi
-
-    if test x"$samba_dmapi_libs" = x"" ; then
-        AC_CHECK_LIB(dmapi, dm_get_eventlist,
-                [samba_dmapi_libs="-ldmapi"], [])
-    fi
-
-    if test x"$samba_dmapi_libs" = x"" ; then
-	AC_CHECK_LIB(xdsm, dm_get_eventlist,
-		[samba_dmapi_libs="-lxdsm"], [])
-    fi
-
-
-    # Only bother to test ehaders if we have a candidate DMAPI library
-    if test x"$samba_dmapi_libs" != x"" ; then
-	AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h)
-    fi
-
-    if test x"$samba_dmapi_libs" != x"" ; then
-	samba_dmapi_save_LIBS="$LIBS"
-	LIBS="$LIBS $samba_dmapi_libs"
-	AC_TRY_LINK(
-		[
-#include <time.h>      /* needed by Tru64 */
-#include <sys/types.h> /* needed by AIX */
-#ifdef HAVE_XFS_DMAPI_H
-#include <xfs/dmapi.h>
-#elif defined(HAVE_SYS_DMI_H)
-#include <sys/dmi.h>
-#elif defined(HAVE_SYS_JFSDMAPI_H)
-#include <sys/jfsdmapi.h>
-#elif defined(HAVE_SYS_DMAPI_H)
-#include <sys/dmapi.h>
-#elif defined(HAVE_DMAPI_H)
-#include <dmapi.h>
-#endif
-		],
-		[
-/* This link test is designed to fail on IRI 6.4, but should
- * succeed on Linux, IRIX 6.5 and AIX.
- */
-	char * version;
-	dm_eventset_t events;
-	/* This doesn't take an argument on IRIX 6.4. */
-	dm_init_service(&version);
-	/* IRIX 6.4 expects events to be a pointer. */
-	DMEV_ISSET(DM_EVENT_READ, events);
-		],
-		[
-		    true # DMAPI link test succeeded
-		],
-		[
-		    # DMAPI link failure
-		    samba_dmapi_libs=
-		])
-	LIBS="$samba_dmapi_save_LIBS"
-    fi
-
-    if test x"$samba_dmapi_libs" = x"" ; then
-	# DMAPI detection failure actions begin
-	ifelse($2, [],
-	    [
-		AC_ERROR(Failed to detect a supported DMAPI implementation)
-	    ],
-	    [
-		$2
-	    ])
-	# DMAPI detection failure actions end
-    else
-	# DMAPI detection success actions start
-	ifelse($1, [],
-	    [
-		AC_DEFINE(USE_DMAPI, 1,
-		    [Whether we should build DMAPI integration components])
-		AC_MSG_NOTICE(Found DMAPI support in $samba_dmapi_libs)
-	    ],
-	    [
-		$1
-	    ])
-	# DMAPI detection success actions end
-    fi
-
-])
-
-dnl SMB_IF_RTSIGNAL_BUG([actions if true],
-dnl			[actions if false],
-dnl			[actions if cross compiling])
-dnl Test whether we can call sigaction with RT_SIGNAL_NOTIFY and
-dnl RT_SIGNAL_LEASE (also RT_SIGNAL_AIO for good measure, though
-dnl I don't believe that triggers any bug.
-dnl
-dnl See the samba-technical thread titled "Failed to setup
-dnl RT_SIGNAL_NOTIFY handler" for details on the bug in question.
-AC_DEFUN([SMB_IF_RTSIGNAL_BUG],
-[
-    rt_signal_notify_works=yes
-    rt_signal_lease_works=yes
-    rt_signal_aio_works=yes
-
-    AC_MSG_CHECKING(if sigaction works with realtime signals)
-    AC_TRY_RUN(
-	[
-#include <sys/types.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#ifndef SIGRTMIN
-#define SIGRTMIN NSIG
-#endif
-/* from smbd/notify_kernel.c */
-#ifndef RT_SIGNAL_NOTIFY
-#define RT_SIGNAL_NOTIFY (SIGRTMIN+2)
-#endif
-
-/* from smbd/aio.c */
-#ifndef RT_SIGNAL_AIO
-#define RT_SIGNAL_AIO (SIGRTMIN+3)
-#endif
-
-/* from smbd/oplock_linux.c */
-#ifndef RT_SIGNAL_LEASE
-#define RT_SIGNAL_LEASE (SIGRTMIN+1)
-#endif
-
-static void signal_handler(int sig, siginfo_t *info, void *unused)
-{
-    int do_nothing = 0;
-}
-
-int main(void)
-{
-    int result = 0;
-    struct sigaction act = {0};
-
-    act.sa_sigaction = signal_handler;
-    act.sa_flags = SA_SIGINFO;
-    sigemptyset( &act.sa_mask );
-
-    if (sigaction(RT_SIGNAL_LEASE, &act, 0) != 0) {
-	    /* Failed to setup RT_SIGNAL_LEASE handler */
-	    result += 1;
-    }
-
-    if (sigaction(RT_SIGNAL_NOTIFY, &act, 0) != 0) {
-	    /* Failed to setup RT_SIGNAL_NOTIFY handler */
-	    result += 10;
-    }
-
-    if (sigaction(RT_SIGNAL_AIO, &act, 0) != 0) {
-	    /* Failed to setup RT_SIGNAL_AIO handler */
-	    result += 100;
-    }
-
-    /* zero on success */
-    return result;
-}
-	],
-	[
-	    AC_MSG_RESULT(yes)
-	    $2
-	],
-	[
-	    AC_MSG_RESULT(no)
-	    case "$ac_status" in
-		1|11|101|111)  rt_signal_lease_ok=no ;;
-	    esac
-	    case "$ac_status" in
-		10|11|110|111)  rt_signal_notify_ok=no ;;
-	    esac
-	    case "$ac_status" in
-		100|110|101|111)  rt_signal_aio_ok=no ;;
-	    esac
-	    $2
-	],
-	[
-	    AC_MSG_RESULT(cross)
-	    $3
-	])
-])
-
-m4_include(../lib/replace/libreplace.m4)
diff --git a/source3/m4/autoconf-2.60.m4 b/source3/m4/autoconf-2.60.m4
deleted file mode 100644
index b2694fde62..0000000000
--- a/source3/m4/autoconf-2.60.m4
+++ /dev/null
@@ -1,236 +0,0 @@
-# AC_GNU_SOURCE
-# --------------
-AC_DEFUN([AC_GNU_SOURCE],
-[AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif])dnl
-AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-AC_DEFINE([_GNU_SOURCE])
-])
-
-# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST,
-#		ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE)
-# --------------------------------------------------------------
-# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99')
-# by trying to compile a program of TEST-PROLOGUE and TEST-BODY.  If this fails,
-# try again with each compiler option in the space-separated OPTION-LIST; if one
-# helps, append it to CC.  If eventually successful, run ACTION-IF-AVAILABLE,
-# else ACTION-IF-UNAVAILABLE.
-AC_DEFUN([_AC_C_STD_TRY],
-[AC_MSG_CHECKING([for $CC option to accept ISO ]m4_translit($1, [c], [C]))
-AC_CACHE_VAL(ac_cv_prog_cc_$1,
-[ac_cv_prog_cc_$1=no
-ac_save_CC=$CC
-AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])])
-for ac_arg in '' $4
-do
-  CC="$ac_save_CC $ac_arg"
-  _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg])
-  test "x$ac_cv_prog_cc_$1" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-])# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_$1" in
-  x)
-    AC_MSG_RESULT([none needed]) ;;
-  xno)
-    AC_MSG_RESULT([unsupported]) ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_$1"
-    AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;;
-esac
-AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6])
-])# _AC_C_STD_TRY
-
-# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE])
-# ----------------------------------------------------------------
-# If the C compiler is not in ISO C99 mode by default, try to add an
-# option to output variable CC to make it so.  This macro tries
-# various options that select ISO C99 on some system or another.  It
-# considers the compiler to be in ISO C99 mode if it handles mixed
-# code and declarations, _Bool, inline and restrict.
-AC_DEFUN([_AC_PROG_CC_C99],
-[_AC_C_STD_TRY([c99],
-[[#include <stdarg.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict(ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy work.
-static void
-test_varargs(const char *format, ...)
-{
-  va_list args;
-  va_start(args, format);
-  va_list args_copy;
-  va_copy(args_copy, args);
-
-  const char *str;
-  int number;
-  float fnumber;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case 's': // string
-	  str = va_arg(args_copy, const char *);
-	  break;
-	case 'd': // int
-	  number = va_arg(args_copy, int);
-	  break;
-	case 'f': // float
-	  fnumber = (float) va_arg(args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end(args_copy);
-  va_end(args);
-}
-]],
-[[
-  // Check bool and long long datatypes.
-  _Bool success = false;
-  long long int bignum = -1234567890LL;
-  unsigned long long int ubignum = 1234567890uLL;
-
-  // Check restrict.
-  if (test_restrict("String literal") != 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  test_varargs("s, d' f .", "string", 65, 34.234);
-
-  // Check incomplete arrays work.
-  struct incomplete_array *ia =
-    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = (double) i * 1.234;
-
-  // Check named initialisers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[43] = 543;
-
-  // work around unused variable warnings
-  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
-]],
-dnl Try
-dnl GCC		-std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
-dnl AIX		-qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99)
-dnl Intel ICC	-c99
-dnl IRIX	-c99
-dnl Solaris	(unused because it causes the compiler to assume C99 semantics for
-dnl		library functions, and this is invalid before Solaris 10: -xc99)
-dnl Tru64	-c99
-dnl with extended modes being tried first.
-[[-std=gnu99 -c99 -qlanglvl=extc99]], [$1], [$2])[]dnl
-])# _AC_PROG_CC_C99
-
-# AC_PROG_CC_C99
-# --------------
-AC_DEFUN([AC_PROG_CC_C99],
-[ AC_REQUIRE([AC_PROG_CC])dnl
-  _AC_PROG_CC_C99
-])
-
-# AC_USE_SYSTEM_EXTENSIONS
-# ------------------------
-# Enable extensions on systems that normally disable them,
-# typically due to standards-conformance issues.
-m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
-[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-
-  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-  if test "$MINIX" = yes; then
-    AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for `stat' and other
-       things to work.])
-    AC_DEFINE([_POSIX_1_SOURCE], [2],
-      [Define to 2 if the system does not provide POSIX.1 features
-       except with this defined.])
-    AC_DEFINE([_MINIX], [1],
-      [Define to 1 if on MINIX.])
-  fi
-
-  AH_VERBATIM([__EXTENSIONS__],
-[/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-])
-  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-    [ac_cv_safe_to_define___extensions__],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[
-#	  define __EXTENSIONS__ 1
-	  ]AC_INCLUDES_DEFAULT])],
-       [ac_cv_safe_to_define___extensions__=yes],
-       [ac_cv_safe_to_define___extensions__=no])])
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    AC_DEFINE([__EXTENSIONS__])
-  AC_DEFINE([_ALL_SOURCE])
-  AC_DEFINE([_GNU_SOURCE])
-  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-  AC_DEFINE([_TANDEM_SOURCE])
-])# AC_USE_SYSTEM_EXTENSIONS
-])
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
deleted file mode 100644
index 94c36bc6bd..0000000000
--- a/source3/m4/check_path.m4
+++ /dev/null
@@ -1,89 +0,0 @@
-dnl
-dnl Samba3 build environment path checks
-dnl
-dnl Copyright (C) Michael Adam 2008
-dnl
-dnl Released under the GNU General Public License
-dnl http://www.gnu.org/licenses/
-dnl
-
-AC_LIBREPLACE_LOCATION_CHECKS
-
-m4_include(../dynconfig/config.m4)
-
-#################################################
-# set prefix for 'make test'
-selftest_prefix="./st"
-AC_SUBST(selftest_prefix)
-AC_ARG_WITH(selftest-prefix,
-[AS_HELP_STRING([--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])
-  ;;
-  * )
-    selftest_prefix="$withval"
-    ;;
-  esac
-])
-
-## check for --enable-debug first before checking CFLAGS before
-## so that we don't mix -O and -g
-debug=no
-AC_ARG_ENABLE(debug,
-[AS_HELP_STRING([--enable-debug], [Turn on compiler debugging information (default=no)])],
-    [if eval "test x$enable_debug = xyes"; then
-	debug=yes
-    fi])
-
-AC_SUBST(developer)
-developer=no
-AC_ARG_ENABLE(developer, [AS_HELP_STRING([--enable-developer], [Turn on developer warnings and debugging (default=no)])],
-    [if eval "test x$enable_developer = xyes"; then
-        debug=yes
-        developer=yes
-        selftest=yes
-    fi])
-
-AC_SUBST(selftest)
-selftest=no
-AC_ARG_ENABLE(selftest, [AS_HELP_STRING([--enable-selftest], [Turn on selftest capability (default=no)])],
-    [if eval "test x$enable_selftest = xyes"; then
-        debug=yes
-        selftest=yes
-    fi])
-
-krb5developer=no
-AC_ARG_ENABLE(krb5developer, [AS_HELP_STRING([--enable-krb5developer], [Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)])],
-    [if eval "test x$enable_krb5developer = xyes"; then
-        debug=yes
-        developer=yes
-	krb5_developer=yes
-    fi])
-
-picky_developer=no
-AC_ARG_ENABLE(picky-developer, [AS_HELP_STRING([--enable-picky-developer], [Halt compilation on warnings])],
-    [if eval "test x$enable_picky_developer = xyes"; then
-        debug=yes
-        developer=yes
-        picky_developer=yes
-    fi])
-
-AC_ARG_WITH(cfenc,
-[AS_HELP_STRING([--with-cfenc=HEADERDIR], [Use internal CoreFoundation encoding API for optimization (Mac OS X/Darwin only)])],
-[
-# May be in source $withval/CoreFoundation/StringEncodings.subproj.
-# Should have been in framework $withval/CoreFoundation.framework/Headers.
-for d in \
-    $withval/CoreFoundation/StringEncodings.subproj \
-    $withval/StringEncodings.subproj \
-    $withval/CoreFoundation.framework/Headers \
-    $withval/Headers \
-    $withval
-do
-    if test -r $d/CFStringEncodingConverter.h; then
-        ln -sfh $d include/CoreFoundation
-    fi
-done
-])
-
diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4
deleted file mode 100644
index f0e3b8a96e..0000000000
--- a/source3/m4/samba_version.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-dnl
-dnl Samba3 build environment - Samba version variables
-dnl
-dnl Copyright (C) Michael Adam 2008
-dnl
-dnl Released under the GNU General Public License
-dnl http://www.gnu.org/licenses/
-dnl
-dnl
-
-SMB_VERSION_STRING=`cat $srcdir/include/autoconf/version.h | grep '#define SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
-echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
-
-SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2`
-if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then
-	echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
-fi
-SAMBA_VERSION_COMMIT_DATE=`cat $srcdir/include/autoconf/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_COMMIT_TIME=`cat $srcdir/include/autoconf/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_COMMIT_TIME}"
-fi
-