s4: Remove the old perl/m4/make/mk-based build system.

The new waf-based build system now has all the same functionality, and
the old build system has been broken for quite some time.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104

21 files changed, 0 insertions, 630 deletions

diff --git a/lib/async_req/config.mk b/lib/async_req/config.mk
deleted file mode 100644
index 64e537c088..0000000000
--- a/lib/async_req/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-[SUBSYSTEM::LIBASYNC_REQ]
-PUBLIC_DEPENDENCIES = LIBREPLACE_NETWORK LIBTALLOC LIBTEVENT
-
-LIBASYNC_REQ_OBJ_FILES = $(addprefix ../lib/async_req/, async_sock.o)
diff --git a/lib/crypto/config.mk b/lib/crypto/config.mk
deleted file mode 100644
index c9ba779be2..0000000000
--- a/lib/crypto/config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################
-# Start SUBSYSTEM LIBCRYPTO
-[SUBSYSTEM::LIBCRYPTO]
-# End SUBSYSTEM LIBCRYPTO
-##############################
-
-LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
-					 crc32.o md5.o hmacmd5.o md4.o \
-					 arcfour.o sha256.o hmacsha256.o \
-					 aes.o rijndael-alg-fst.o)
-
-[SUBSYSTEM::TORTURE_LIBCRYPTO]
-PRIVATE_DEPENDENCIES = LIBCRYPTO
-
-TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
-		md4test.o md5test.o hmacmd5test.o)
-
-$(eval $(call proto_header_template,$(libcryptosrcdir)/test_proto.h,$(TORTURE_LIBCRYPTO_OBJ_FILES:.o=.c)))
diff --git a/lib/nss_wrapper/config.mk b/lib/nss_wrapper/config.mk
deleted file mode 100644
index 015fbe511c..0000000000
--- a/lib/nss_wrapper/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-##############################
-# Start SUBSYSTEM NSS_WRAPPER
-[SUBSYSTEM::NSS_WRAPPER]
-# End SUBSYSTEM NSS_WRAPPER
-##############################
-
-NSS_WRAPPER_OBJ_FILES = $(nsswrappersrcdir)/nss_wrapper.o
diff --git a/lib/popt/config.mk b/lib/popt/config.mk
deleted file mode 100644
index 04cc2c7ea5..0000000000
--- a/lib/popt/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[SUBSYSTEM::LIBPOPT]
-CFLAGS = -I$(poptsrcdir)
-
-LIBPOPT_OBJ_FILES = $(addprefix $(poptsrcdir)/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
-
diff --git a/lib/smbconf/config.mk b/lib/smbconf/config.mk
deleted file mode 100644
index de66b90918..0000000000
--- a/lib/smbconf/config.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-[SUBSYSTEM::LIBSMBCONF]
-
-LIBSMBCONF_OBJ_FILES = $(addprefix ../lib/smbconf/, smbconf.o smbconf_txt.o smbconf_util.o)
diff --git a/lib/socket_wrapper/config.mk b/lib/socket_wrapper/config.mk
deleted file mode 100644
index 60cfb3209a..0000000000
--- a/lib/socket_wrapper/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-##############################
-# Start SUBSYSTEM SOCKET_WRAPPER
-[SUBSYSTEM::SOCKET_WRAPPER]
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-# End SUBSYSTEM SOCKET_WRAPPER
-##############################
-
-SOCKET_WRAPPER_OBJ_FILES = $(socketwrappersrcdir)/socket_wrapper.o
diff --git a/lib/talloc/config.mk b/lib/talloc/config.mk
deleted file mode 100644
index 5cdf3a1a8e..0000000000
--- a/lib/talloc/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-[LIBRARY::LIBTALLOC]
-OUTPUT_TYPE = MERGED_OBJ
-CFLAGS = -I$(tallocsrcdir)
-
-LIBTALLOC_OBJ_FILES = $(tallocsrcdir)/talloc.o
-
-MANPAGES += $(tallocdir)/talloc.3
diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk
deleted file mode 100644
index 22caadaba5..0000000000
--- a/lib/tdb/config.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-################################################
-# Start SUBSYSTEM LIBTDB
-[LIBRARY::LIBTDB]
-OUTPUT_TYPE = MERGED_OBJ
-CFLAGS = -I$(tdbsrcdir)/include
-#
-# End SUBSYSTEM ldb
-################################################
-
-LIBTDB_OBJ_FILES = $(addprefix $(tdbsrcdir)/common/, \
-	tdb.o dump.o io.o lock.o \
-	open.o traverse.o freelist.o \
-	error.o transaction.o check.o)
-
-################################################
-# Start BINARY tdbtool
-[BINARY::tdbtool]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBTDB
-# End BINARY tdbtool
-################################################
-
-tdbtool_OBJ_FILES = $(tdbsrcdir)/tools/tdbtool.o
-
-################################################
-# Start BINARY tdbtorture
-[BINARY::tdbtorture]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBTDB
-# End BINARY tdbtorture
-################################################
-
-tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
-
-################################################
-# Start BINARY tdbrestore
-[BINARY::tdbrestore]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBTDB
-# End BINARY tdbrestore
-################################################
-
-################################################
-# Start BINARY tdbdump
-[BINARY::tdbdump]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBTDB
-# End BINARY tdbdump
-################################################
-
-tdbdump_OBJ_FILES = $(tdbsrcdir)/tools/tdbdump.o
-
-################################################
-# Start BINARY tdbbackup
-[BINARY::tdbbackup]
-INSTALLDIR = BINDIR
-PRIVATE_DEPENDENCIES = \
-		LIBTDB
-# End BINARY tdbbackup
-################################################
-
-tdbbackup_OBJ_FILES = $(tdbsrcdir)/tools/tdbbackup.o
diff --git a/lib/tdr/config.mk b/lib/tdr/config.mk
deleted file mode 100644
index 07506ec647..0000000000
--- a/lib/tdr/config.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-[SUBSYSTEM::TDR]
-CFLAGS = -Ilib/tdr
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
-
-TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o
-
-$(eval $(call proto_header_template,$(libtdrsrcdir)/tdr_proto.h,$(TDR_OBJ_FILES:.o=.c)))
-
-PUBLIC_HEADERS += $(libtdrsrcdir)/tdr.h
diff --git a/lib/torture/config.mk b/lib/torture/config.mk
deleted file mode 100644
index b4ad9ae17f..0000000000
--- a/lib/torture/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# TORTURE subsystem
-[LIBRARY::torture]
-PUBLIC_DEPENDENCIES = \
-		LIBSAMBA-HOSTCONFIG \
-		LIBSAMBA-UTIL \
-		LIBSAMBA-ERRORS \
-		LIBTALLOC \
-		LIBTEVENT
-CFLAGS = -I$(libtorturesrcdir) -I$(libtorturesrcdir)/../
-
-torture_VERSION = 0.0.1
-torture_SOVERSION = 0
-
-PC_FILES += $(libtorturesrcdir)/torture.pc
-torture_OBJ_FILES = $(addprefix $(libtorturesrcdir)/, torture.o subunit.o)
-
-PUBLIC_HEADERS += $(libtorturesrcdir)/torture.h
diff --git a/lib/tsocket/config.mk b/lib/tsocket/config.mk
deleted file mode 100644
index ca2978a426..0000000000
--- a/lib/tsocket/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-[SUBSYSTEM::LIBTSOCKET]
-PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
-PUBLIC_DEPENDENCIES = LIBTALLOC LIBTEVENT
-
-LIBTSOCKET_OBJ_FILES = $(addprefix ../lib/tsocket/, \
-					tsocket.o \
-					tsocket_helpers.o \
-					tsocket_bsd.o)
-
-PUBLIC_HEADERS += $(addprefix ../lib/tsocket/, \
-				 tsocket.h\
-				 tsocket_internal.h)
-
diff --git a/lib/uid_wrapper/config.mk b/lib/uid_wrapper/config.mk
deleted file mode 100644
index 1bebc68118..0000000000
--- a/lib/uid_wrapper/config.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-##############################
-# Start SUBSYSTEM UID_WRAPPER
-[SUBSYSTEM::UID_WRAPPER]
-PRIVATE_DEPENDENCIES = LIBTALLOC
-# End SUBSYSTEM UID_WRAPPER
-##############################
-
-UID_WRAPPER_OBJ_FILES = $(uidwrappersrcdir)/uid_wrapper.o
-
diff --git a/lib/util/capability.m4 b/lib/util/capability.m4
deleted file mode 100644
index 2a95a607d5..0000000000
--- a/lib/util/capability.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-AC_CACHE_CHECK([for irix specific capabilities],samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES,[
-AC_TRY_RUN([#include <sys/types.h>
-#include <sys/capability.h>
-main() {
- cap_t cap;
- if ((cap = cap_get_proc()) == NULL)
-   exit(1);
- cap->cap_effective |= CAP_NETWORK_MGT;
- cap->cap_inheritable |= CAP_NETWORK_MGT;
- cap_set_proc(cap);
- exit(0);
-}
-],
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross)])
-if test x"$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" = x"yes"; then
-    AC_DEFINE(HAVE_IRIX_SPECIFIC_CAPABILITIES,1,[Whether IRIX specific capabilities are available])
-fi
diff --git a/lib/util/charset/config.m4 b/lib/util/charset/config.m4
deleted file mode 100644
index 453de9fe26..0000000000
--- a/lib/util/charset/config.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-dnl SMB_CHECK_ICONV(hdr, msg, action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV,[
-  AC_MSG_CHECKING($2)
-  AC_TRY_RUN([#include <stdlib.h>
-#include <$1>
-
-int main()
-{
-   iconv_t cd = iconv_open("ASCII","UCS-2LE");
-   if (cd == 0 || cd == (iconv_t)-1) return -1;
-   return 0;
-} 
-   ],
-   [AC_MSG_RESULT(yes); $3],
-   [AC_MSG_RESULT(no); $4],
-   [AC_MSG_RESULT(cross); $4])
-])
-
-dnl SMB_CHECK_ICONV_DIR(dir,action-if-found,action-if-not-found)
-AC_DEFUN(SMB_CHECK_ICONV_DIR,
-[
-	save_CPPFLAGS="$CPPFLAGS"
-	save_LDFLAGS="$LDFLAGS"
-	save_LIBS="$LIBS"
-	CPPFLAGS="-I$1/include"
-	LDFLAGS="-L$1/lib"
-	LIBS=-liconv
-
-	SMB_CHECK_ICONV(iconv.h,Whether iconv.h is present,[ AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) $2 ], [
-        LIBS=-lgiconv
-        SMB_CHECK_ICONV(giconv.h,Whether giconv.h is present, [AC_DEFINE(HAVE_GICONV_H,1,[Whether giconv.h is present]) $2],[$3])
-	])
-
-	CPPFLAGS="$save_CPPFLAGS"
-	LDFLAGS="$save_LDFLAGS"
-	LIBS="$save_LIBS"
-])
-
-ICONV_FOUND=no
-LOOK_DIRS="/usr /usr/local /sw"
-AC_ARG_WITH(libiconv,
-[  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
-[
-  if test "$withval" = "no" ; then
-    AC_MSG_ERROR(I won't take no for an answer)
-  else
-     if test "$withval" != "yes" ; then
-	SMB_CHECK_ICONV_DIR($withval, [
-		ICONV_FOUND=yes; 
-		ICONV_CPPFLAGS="$CPPFLAGS"
-		ICONV_LIBS="$LIBS"
-		ICONV_LDFLAGS="$LDFLAGS"
-		], [AC_MSG_ERROR([No iconv library found in $withval])])
-     fi
-  fi
-])
-
-if test x$ICONV_FOUND = xno; then
-	SMB_CHECK_ICONV(iconv.h,
-		[Whether iconv.h is present], 
-		[AC_DEFINE(HAVE_ICONV_H,1,[Whether iconv.h is present]) ICONV_FOUND=yes])
-fi
-
-for i in $LOOK_DIRS ; do
-	if test x$ICONV_FOUND = xyes; then
-		break
-	fi
-	
-	SMB_CHECK_ICONV_DIR($i, [
-		ICONV_FOUND=yes
-		ICONV_CPPFLAGS="$CPPFLAGS"
-		ICONV_LIBS="$LIBS"
-		ICONV_LDFLAGS="$LDFLAGS"
-		], [])
-done
-
-if test x"$ICONV_FOUND" = x"no"; then 
-    AC_MSG_WARN([Sufficient support for iconv function was not found. 
-    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!])
-	SMB_ENABLE(ICONV,NO)
-else
-	AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether external iconv is available])
-	SMB_ENABLE(ICONV,YES)
-fi
-
-SMB_EXT_LIB(ICONV,[${ICONV_LIBS}],[${ICONV_CFLAGS}],[${ICONV_CPPFLAGS}],[${ICONV_LDFLAGS}])
diff --git a/lib/util/charset/config.mk b/lib/util/charset/config.mk
deleted file mode 100644
index 952c13a84d..0000000000
--- a/lib/util/charset/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################
-# Start SUBSYSTEM CHARSET
-[SUBSYSTEM::CHARSET]
-PUBLIC_DEPENDENCIES = ICONV
-PRIVATE_DEPENDENCIES = DYNCONFIG
-# End SUBSYSTEM CHARSET
-################################################
-
-CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o codepoints.o)
-
-PUBLIC_HEADERS += $(libcharsetsrcdir)/charset.h
diff --git a/lib/util/config.mk b/lib/util/config.mk
deleted file mode 100644
index 719f5f2493..0000000000
--- a/lib/util/config.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-[LIBRARY::LIBSAMBA-UTIL]
-PUBLIC_DEPENDENCIES = \
-		LIBTALLOC LIBCRYPTO \
-		SOCKET_WRAPPER LIBREPLACE_NETWORK \
-		CHARSET EXECINFO UID_WRAPPER
-
-LIBSAMBA-UTIL_VERSION = 0.0.1
-LIBSAMBA-UTIL_SOVERSION = 0
-
-LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
-		xfile.o \
-		debug.o \
-		fault.o \
-		signal.o \
-		system.o \
-		time.o \
-		genrand.o \
-		dprintf.o \
-		util_str.o \
-		rfc1738.o \
-		substitute.o \
-		util_strlist.o \
-		util_file.o \
-		data_blob.o \
-		util.o \
-		blocking.o \
-		util_net.o \
-		fsusage.o \
-		ms_fnmatch.o \
-		mutex.o \
-		idtree.o \
-		become_daemon.o \
-		rbtree.o \
-		talloc_stack.o \
-		smb_threads.o \
-		params.o \
-		parmlist.o \
-		util_id.o
-		select.o)
-
-PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
-				 dlinklist.h \
-				 attr.h \
-				 byteorder.h \
-				 data_blob.h \
-				 debug.h \
-				 memory.h \
-				 mutex.h \
-				 safe_string.h \
-				 time.h \
-				 util_ldb.h \
-				 talloc_stack.h \
-				 tevent_ntstatus.h \
-				 tevent_unix.h	\
-				 xfile.h)
-
-[SUBSYSTEM::ASN1_UTIL]
-
-ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
-
-[SUBSYSTEM::UNIX_PRIVS]
-PRIVATE_DEPENDENCIES = UID_WRAPPER
-
-UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o
-
-$(eval $(call proto_header_template,$(libutilsrcdir)/unix_privs.h,$(UNIX_PRIVS_OBJ_FILES:.o=.c)))
-
-################################################
-# Start SUBSYSTEM WRAP_XATTR
-[SUBSYSTEM::WRAP_XATTR]
-PUBLIC_DEPENDENCIES = XATTR
-#
-# End SUBSYSTEM WRAP_XATTR
-################################################
-
-WRAP_XATTR_OBJ_FILES = $(libutilsrcdir)/wrap_xattr.o
-
-[SUBSYSTEM::UTIL_TDB]
-PUBLIC_DEPENDENCIES = LIBTDB
-
-UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o
-
-[SUBSYSTEM::UTIL_TEVENT]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-
-UTIL_TEVENT_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
-			tevent_unix.o \
-			tevent_ntstatus.o)
-
-[SUBSYSTEM::UTIL_LDB]
-PUBLIC_DEPENDENCIES = LIBLDB
-
-UTIL_LDB_OBJ_FILES = $(libutilsrcdir)/util_ldb.o
-
-[SUBSYSTEM::UTIL_RUNCMD]
-PUBLIC_DEPENDENCIES = LIBTEVENT
-
-UTIL_RUNCMD_OBJ_FILES = $(libutilsrcdir)/util_runcmd.o
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
deleted file mode 100644
index c22976998e..0000000000
--- a/lib/util/fault.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_CHECK_HEADERS(execinfo.h)
-AC_SEARCH_LIBS_EXT(backtrace, [execinfo], EXECINFO_LIBS)
-AC_CHECK_FUNC_EXT(backtrace, $EXECINFO_LIBS)
-
-
-if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
-	SMB_ENABLE(EXECINFO, YES)
-	EXECINFO_CFLAGS="$CFLAGS"
-	EXECINFO_CPPFLAGS="$CPPFLAGS"
-	EXECINFO_LDFLAGS="$LDFLAGS"
-	LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
-	CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CFLAGS)
-	CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CPPFLAGS)
-else
-	SMB_ENABLE(EXECINFO,NO)
-fi
-
-SMB_EXT_LIB(EXECINFO, [${EXECINFO_LIBS}], [${EXECINFO_CFLAGS}], [${EXECINFO_CPPFLAGS}], [${EXECINFO_LDFLAGS}])
diff --git a/lib/util/fsusage.m4 b/lib/util/fsusage.m4
deleted file mode 100644
index 843965041f..0000000000
--- a/lib/util/fsusage.m4
+++ /dev/null
@@ -1,200 +0,0 @@
-#################################################
-# these tests are taken from the GNU fileutils package
-AC_CHECKING(how to get filesystem space usage)
-AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h sys/vfs.h)
-
-AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif])
-
-space=no
-
-# Test for statvfs64.
-if test $space = no; then
-  # SVR4
-  AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64,
-  [AC_TRY_RUN([
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/statvfs.h>
-  main ()
-  {
-    struct statvfs64 fsd;
-    exit (statvfs64 (".", &fsd));
-  }],
-  fu_cv_sys_stat_statvfs64=yes,
-  fu_cv_sys_stat_statvfs64=no,
-  fu_cv_sys_stat_statvfs64=cross)])
-  if test $fu_cv_sys_stat_statvfs64 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATVFS64,1,[Whether statvfs64() is available])
-  fi
-fi
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $space = no; then
-  # SVR4
-  AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-		 [AC_TRY_LINK([#include <sys/types.h>
-#include <sys/statvfs.h>],
-			      [struct statvfs fsd; statvfs (0, &fsd);],
-			      fu_cv_sys_stat_statvfs=yes,
-			      fu_cv_sys_stat_statvfs=no)])
-  if test $fu_cv_sys_stat_statvfs = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATVFS,1,[Whether statvfs() is available])
-  fi
-fi
-
-# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
-# systems use f_bsize.
-AC_CACHE_CHECK([that statvfs.f_frsize works],samba_cv_frsize, [
-    AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/statvfs.h>],[struct statvfs buf; buf.f_frsize = 0],
-	samba_cv_frsize=yes,samba_cv_frsize=no)])
-if test x"$samba_cv_frsize" = x"yes"; then
-    AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
-fi
-
-if test $space = no; then
-  # DEC Alpha running OSF/1
-  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-  [AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-  main ()
-  {
-    struct statfs fsd;
-    fsd.f_fsize = 0;
-    exit (statfs (".", &fsd, sizeof (struct statfs)));
-  }],
-  fu_cv_sys_stat_statfs3_osf1=yes,
-  fu_cv_sys_stat_statfs3_osf1=no,
-  fu_cv_sys_stat_statfs3_osf1=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS3_OSF1,1,[Whether statfs requires 3 arguments])
-  fi
-fi
-
-if test $space = no; then
-# AIX
-  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-  [AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_bsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_bsize=yes,
-  fu_cv_sys_stat_statfs2_bsize=no,
-  fu_cv_sys_stat_statfs2_bsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_BSIZE,1,[Whether statfs requires two arguments and struct statfs has bsize property])
-  fi
-fi
-
-if test $space = no; then
-# SVR3
-  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-  [AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-  main ()
-  {
-  struct statfs fsd;
-  exit (statfs (".", &fsd, sizeof fsd, 0));
-  }],
-    fu_cv_sys_stat_statfs4=yes,
-    fu_cv_sys_stat_statfs4=no,
-    fu_cv_sys_stat_statfs4=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-  if test $fu_cv_sys_stat_statfs4 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS4,1,[Whether statfs requires 4 arguments])
-  fi
-fi
-
-if test $space = no; then
-# 4.4BSD and NetBSD
-  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_fsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_fsize=yes,
-  fu_cv_sys_stat_statfs2_fsize=no,
-  fu_cv_sys_stat_statfs2_fsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-    space=yes
-	AC_DEFINE(STAT_STATFS2_FSIZE,1,[Whether statfs requires 2 arguments and struct statfs has fsize])
-  fi
-fi
-
-if test $space = no; then
-  # Ultrix
-  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-  main ()
-  {
-  struct fs_data fsd;
-  /* Ultrix's statfs returns 1 for success,
-     0 for not mounted, -1 for failure.  */
-  exit (statfs (".", &fsd) != 1);
-  }],
-  fu_cv_sys_stat_fs_data=yes,
-  fu_cv_sys_stat_fs_data=no,
-  fu_cv_sys_stat_fs_data=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-  if test $fu_cv_sys_stat_fs_data = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and struct fs_data is available])
-  fi
-fi
diff --git a/lib/util/signal.m4 b/lib/util/signal.m4
deleted file mode 100644
index c6d7f72f68..0000000000
--- a/lib/util/signal.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(sigprocmask sigblock sigaction)
diff --git a/lib/util/util.m4 b/lib/util/util.m4
deleted file mode 100644
index 9e362954cd..0000000000
--- a/lib/util/util.m4
+++ /dev/null
@@ -1 +0,0 @@
-AC_CHECK_FUNCS(setsid)
diff --git a/lib/util/xattr.m4 b/lib/util/xattr.m4
deleted file mode 100644
index 497809a47a..0000000000
--- a/lib/util/xattr.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl ############################################
-dnl use flistxattr as the key function for having 
-dnl sufficient xattr support for posix xattr backend
-AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h)
-AC_SEARCH_LIBS_EXT(flistxattr, [attr], XATTR_LIBS)
-AC_CHECK_FUNC_EXT(flistxattr, $XATTR_LIBS)
-SMB_EXT_LIB(XATTR,[${XATTR_LIBS}],[${XATTR_CFLAGS}],[${XATTR_CPPFLAGS}],[${XATTR_LDFLAGS}])
-if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
-	AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt,
-	[old_LIBS=$LIBS
-	 LIBS="$LIBS $XATTRLIBS"
-	 AC_TRY_COMPILE([
-	 	#include <sys/types.h>
-		#if HAVE_ATTR_XATTR_H
-		#include <attr/xattr.h>
-		#elif HAVE_SYS_XATTR_H
-		#include <sys/xattr.h>
-		#endif
-		#ifndef NULL
-		#define NULL ((void *)0)
-		#endif
-		],[
-		getxattr(NULL, NULL, NULL, 0, 0, 0);
-		],smb_attr_cv_xattr_add_opt=yes,smb_attr_cv_xattr_add_opt=no)
-	  LIBS=$old_LIBS])
-	if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
-		AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [xattr functions have additional options])
-	fi
-	AC_DEFINE(HAVE_XATTR_SUPPORT,1,[Whether we have xattr support])
-	SMB_ENABLE(XATTR,YES)
-fi
-