add some configure magic to make it configure and build properly on

linux and aix

(This used to be ctdb commit 6a422e53a60829c7c8d97e31e6ed14ee38cc2d2d)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index dbd650e6db40acddc38ee9ac39307fa791c77f79..9692241da1ae1cd33b086db6c106dc182e80a317 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -1,11 +1,4 @@
 #!gmake
-#
-# Linux
-CTDB_SYSTEM_OBJ = common/system_linux.o
-SCSI_IO = bin/scsi_io
-# AIX
-#CTDB_SYSTEM_OBJ = common/system_aix.o
-#PCAP_LIB = -lpcap
 
 CC = @CC@
 prefix = @prefix@
@@ -35,14 +28,14 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
        -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
-LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ $(PCAP_LIB)
+LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
 
 UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
        lib/util/util_time.o lib/util/util_file.o
 
 CTDB_COMMON_OBJ =  common/ctdb_io.o common/ctdb_util.o \
        common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o  \
-       lib/util/debug.o $(CTDB_SYSTEM_OBJ)
+       lib/util/debug.o @CTDB_SYSTEM_OBJ@
 
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
@@ -58,7 +51,7 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
        $(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
 
 TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store @INFINIBAND_BINS@
-BINS = bin/ctdb $(SCSI_IO)
+BINS = bin/ctdb @CTDB_SCSI_IO@
 SBINS = bin/ctdbd
 
 DIRS = lib bin

diff --git a/ctdb/configure.ac b/ctdb/configure.ac
index 86a70d157d575d015b8146870ffb222dc11eb6bf..63ebc28c91b13ca19db54733f8577a11f4bf3f33 100644 (file)
--- a/ctdb/configure.ac
+++ b/ctdb/configure.ac
@@ -14,6 +14,23 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""])
 AC_INIT(ctdb.h)
 AC_CONFIG_SRCDIR([server/ctdbd.c])
 
+case `uname` in
+  Linux*)
+    CTDB_SYSTEM_OBJ=common/system_linux.o
+    CTDB_SCSI_IO=bin/scsi_io
+    CTDB_PCAP_LDFLAGS=
+    ;;
+  AIX*)
+    CTDB_SYSTEM_OBJ=common/system_aix.o
+    CTDB_SCSI_IO=
+    CTDB_PCAP_LDFLAGS=-lpcap
+    ;;
+  *)
+    echo unknown system  cant configure
+    exit
+    ;;
+esac
+
 AC_LIBREPLACE_ALL_CHECKS
 
 if test "$ac_cv_prog_gcc" = yes; then
@@ -44,5 +61,8 @@ if test x"$ctdb_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
 fi
 
 AC_SUBST(EXTRA_OBJ)
+AC_SUBST(CTDB_SYSTEM_OBJ)
+AC_SUBST(CTDB_SCSI_IO)
+AC_SUBST(CTDB_PCAP_LDFLAGS)
 
 AC_OUTPUT(Makefile)