summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-31 02:17:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-10-31 02:01:44 +0000
commit3deece559159150a0710d8160f39583ba7f2e582 (patch)
tree861600d7060d1ca8764c26f7ecc2cb82a4a44bec /lib/util
parent9401189d5435632bcc6a177845ce03beaa804113 (diff)
downloadsamba-3deece559159150a0710d8160f39583ba7f2e582.tar.gz
samba-3deece559159150a0710d8160f39583ba7f2e582.tar.bz2
samba-3deece559159150a0710d8160f39583ba7f2e582.zip
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
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/capability.m417
-rw-r--r--lib/util/charset/config.m486
-rw-r--r--lib/util/charset/config.mk11
-rw-r--r--lib/util/config.mk98
-rw-r--r--lib/util/fault.m418
-rw-r--r--lib/util/fsusage.m4200
-rw-r--r--lib/util/signal.m41
-rw-r--r--lib/util/util.m41
-rw-r--r--lib/util/xattr.m432
9 files changed, 0 insertions, 464 deletions
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
-