torture/attr: use security_ace_equal instead of sec_ace_equal

[samba.git] / ctdb / configure.ac

diff --git a/ctdb/configure.ac b/ctdb/configure.ac
index 0e8f150aab7f13841bbbdb2feb0038fd0a2bd615..9621f42a658339db6c9ff9ee6cf9038b98d752af 100644 (file)
--- a/ctdb/configure.ac
+++ b/ctdb/configure.ac
@@ -1,17 +1,9 @@
 AC_PREREQ(2.50)
-AC_DEFUN([AC_CHECK_LIB_EXT], [
-       AC_CHECK_LIB([$1],[$3],[$4],[$5],[$7])
-       ac_cv_lib_ext_$1_$3=$ac_cv_lib_$1_$3
-])
-AC_DEFUN([AC_CHECK_FUNC_EXT], [
-       AC_CHECK_FUNC([$1],[$3],[$4])
-       ac_cv_func_ext_$1=$ac_cv_func_$1
-])
+AC_INIT(ctdb, m4_esyscmd([grep 'Version:' ./packaging/RPM/ctdb.spec 2>/dev/null | head -1 | sed -e 's/[ \t]*Version:[ \t]*\([^ \t]*\)[ \t]*.*/\1/' | tr -d '\n']))
 AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(ctdb.h)
 AC_CONFIG_SRCDIR([server/ctdbd.c])
 
 if test "${libdir}" = '${exec_prefix}/lib'; then
@@ -34,6 +26,26 @@ case `uname` in
   AIX*)
     CTDB_SYSTEM_OBJ=common/system_aix.o
     CTDB_SCSI_IO=
+    CPPFLAGS="$CPPFLAGS -D_AIX_=1"
+    CTDB_PCAP_LDFLAGS=-lpcap
+    ;;
+  GNU/kFreeBSD)
+    CTDB_SYSTEM_OBJ=common/system_kfreebsd.o
+    CTDB_SCSI_IO=
+    CTDB_PCAP_LDFLAGS=-lpcap
+    ;;
+  FreeBSD)
+    CTDB_SYSTEM_OBJ=common/system_freebsd.o
+    CTDB_SCSI_IO=
+    CTDB_PCAP_LDFLAGS=-lpcap
+    LDFLAGS="$LDFLAGS -L/usr/local/lib -lexecinfo"
+    AC_SUBST(LDFLAGS)
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include -D_FREEBSD_=1"
+    AC_SUBST(CPPFLAGS)
+    ;;
+  GNU)
+    CTDB_SYSTEM_OBJ=common/system_gnu.o
+    CTDB_SCSI_IO=
     CTDB_PCAP_LDFLAGS=-lpcap
     ;;
   *)
@@ -43,6 +55,7 @@ case `uname` in
 esac
 
 AC_LIBREPLACE_ALL_CHECKS
+AC_LIBREPLACE_NETWORK_CHECKS
 
 if test "$ac_cv_prog_gcc" = yes; then
    CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
@@ -59,6 +72,17 @@ if test ! -z "$LOGDIR"; then
 fi
 AC_SUBST(LOGDIR)
 
+SOCKPATH='${localstatedir}/run/ctdb/ctdbd.socket'
+AC_ARG_WITH([socketpath],
+       [  --with-socketpath=FILE       path to CTDB daemon socket [[LOCALSTATEDIR/run/ctdb/ctdbd.socket]]],
+       SOCKPATH=$withval)
+if test ! -z "$SOCKPATH"; then
+  if test "$SOCKPATH" = "yes" -o "$SOCKPATH" = "no"; then
+         AC_MSG_ERROR([--with-socketpath must specify a file path])
+  fi
+fi
+AC_SUBST(SOCKPATH)
+
 AC_CONFIG_HEADER(config.h)
 
 EXTRA_OBJ=""
@@ -66,19 +90,23 @@ EXTRA_OBJ=""
 m4_include(libpopt.m4)
 m4_include(libtalloc.m4)
 m4_include(libtdb.m4)
-m4_include(libevents.m4)
+m4_include(libtevent.m4)
 m4_include(ib/config.m4)
+m4_include(lib/util/signal.m4)
+m4_include(lib/util/fault.m4)
+m4_include(lib/socket_wrapper/config.m4)
+m4_include(utils/pmda/config.m4)
 
-AC_CHECK_HEADERS(libipq.h linux/netfilter.h)
+AC_CHECK_HEADERS(sched.h)
+AC_CHECK_HEADERS(procinfo.h)
 
-IPQ_LIBS=""
-if test x"$ac_cv_header_libipq_h" = x"yes"; then
-   IPQ_LIBS="-lipq"
-fi
-AC_SUBST(IPQ_LIBS)
+AC_CHECK_DECL([ETIME], [],[AC_DEFINE([ETIME], ETIMEDOUT, [ETIME on non-supporting platforms])], [
+#include <errno.h>
+])
 
-AC_CHECK_HEADERS(sched.h)
 AC_CHECK_FUNCS(sched_setscheduler)
+AC_CHECK_FUNCS(thread_setsched)
+AC_CHECK_FUNCS(mlockall)
 
 AC_CACHE_CHECK([for sin_len in sock],ctdb_cv_HAVE_SOCK_SIN_LEN,[
 AC_TRY_COMPILE([#include <sys/types.h>