when building the initial vnnmap, make sure to skip any deleted nodes

[metze/ctdb/wip.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4d5ace50003c637637eb087e75e107ba0e63d11..aaec420c086ec0e6263a7ed3ee461b42102f0af8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_PREREQ(2.50)
+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([AC_CHECK_LIB_EXT], [
        AC_CHECK_LIB([$1],[$3],[$4],[$5],[$7])
        ac_cv_lib_ext_$1_$3=$ac_cv_lib_$1_$3
@@ -11,9 +12,19 @@ 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
+  case `uname -m` in
+    x86_64|ppc64|powerpc64)
+      libdir='${exec_prefix}/lib64'
+      ;;
+    *)
+      libdir='${exec_prefix}/lib'
+      ;;
+  esac
+fi
+
 case `uname` in
   Linux*)
     CTDB_SYSTEM_OBJ=common/system_linux.o
@@ -58,14 +69,6 @@ m4_include(libtdb.m4)
 m4_include(libevents.m4)
 m4_include(ib/config.m4)
 
-AC_CHECK_HEADERS(libipq.h linux/netfilter.h)
-
-IPQ_LIBS=""
-if test x"$ac_cv_header_libipq_h" = x"yes"; then
-   IPQ_LIBS="-lipq"
-fi
-AC_SUBST(IPQ_LIBS)
-
 AC_CHECK_HEADERS(sched.h)
 AC_CHECK_FUNCS(sched_setscheduler)