Configure/makefile tidy.

WHATS_NEW

@@ -1,3 +1,9 @@
+Version 2.00.28 - 26th November 2004
+====================================
+  Fix partition table signature detection.
+  Minor configure/makefile tidy.
+  Export version.h from tools for clvmd.
+
 Version 2.00.27 - 24th November 2004
 ====================================
   Trap large memory allocation requests.

configure.in

@@ -280,15 +280,18 @@ AC_MSG_RESULT($SELINUX)
 ################################################################################
 dnl -- Build cluster LVM daemon
 AC_MSG_CHECKING(whether to build cluster LVM daemon)
-AC_ARG_WITH(clvmd, [  --with-clvmd=TYPE       Build cluster LVM Daemon: cman/gulm/none],
-CLVMD=$withval, CLVMD=none)
-if test x$CLVMD = xyes ; then
+AC_ARG_WITH(clvmd,
+  [  --with-clvmd=TYPE       Build cluster LVM Daemon: cman/gulm/none
+                          [TYPE=none] ],
+  [ CLVMD="$withval" ],
+  [ CLVMD="none" ])
+if test x$CLVMD = xyes; then
 	CLVMD=cman
 fi
 AC_MSG_RESULT($CLVMD)
 
 dnl -- If clvmd enabled without cluster locking, automagically include it
-if  test x$CLVMD != xnone && test x$CLUSTER = xnone ; then
+if  test x$CLVMD != xnone && test x$CLUSTER = xnone; then
 	CLUSTER=internal
 fi
 

daemons/clvmd/Makefile.in

@@ -15,27 +15,22 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-ifeq ("@CLVMD@", "gulm")
 SOURCES = \
-	clvmd-gulm.c     \
-	tcp-comms.c	 \
-        clvmd-command.c  \
-        clvmd.c          \
-        libclvm.c        \
-        lvm-functions.c  \
-        system-lv.c
-LM_LIBS = -lccs -lgulm
-LM_FLAGS= -DUSE_GULM
-else
-SOURCES = \
-	clvmd-cman.c     \
 	clvmd-command.c  \
 	clvmd.c          \
 	libclvm.c        \
 	lvm-functions.c  \
 	system-lv.c
-LM_LIBS = -ldlm
-LM_FLAGS=
+
+ifeq ("@CLVMD@", "gulm")
+	SOURCES += clvmd-gulm.c tcp-comms.c
+	LMLIBS += -lccs -lgulm
+	CFLAGS += -DUSE_GULM
+endif
+
+ifeq ("@CLVMD@", "cman")
+	SOURCES += clvmd-cman.c
+	LMLIBS += -ldlm
 endif
 
 TARGETS = \
@@ -43,15 +38,14 @@ TARGETS = \
 
 include $(top_srcdir)/make.tmpl
 
-CFLAGS += -D_REENTRANT -fno-strict-aliasing $(LM_FLAGS)
+CFLAGS += -D_REENTRANT -fno-strict-aliasing
 LIBS += -ldevmapper -llvm -lpthread
 
-
 INSTALL_TARGETS = \
 	install_clvmd
 
 clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LM_LIBS) $(LIBS)
+	$(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LMLIBS) $(LIBS)
 
 .PHONY: install_clvmd
 

daemons/clvmd/clvmd.c

@@ -39,7 +39,7 @@
 #include "clvmd-comms.h"
 #include "lvm-functions.h"
 #include "clvm.h"
-#include "../../tools/version.h"
+#include "version.h"
 #include "clvmd.h"
 #include "libdlm.h"
 #include "system-lv.h"

include/.symlinks

@@ -47,3 +47,4 @@
 ../lib/report/report.h
 ../lib/uuid/uuid.h
 ../po/pogen.h
+../tools/version.h