shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Configure/makefile tidy.

Browse Source
This commit is contained in:
Alasdair Kergon 2004-11-26 18:07:17 +00:00
parent 57b8df3e45
commit a266258f4c
6 changed files with 896 additions and 1716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WHATS_NEW
View File

@ -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 Version 2.00.27 - 24th November 2004
==================================== ====================================
Trap large memory allocation requests. Trap large memory allocation requests.

2562
configure vendored
View File

File diff suppressed because it is too large Load Diff

11
configure.in
View File

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

30
daemons/clvmd/Makefile.in
View File

@ -15,27 +15,22 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
ifeq ("@CLVMD@", "gulm")
SOURCES = \ 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-command.c \
clvmd.c \ clvmd.c \
libclvm.c \ libclvm.c \
lvm-functions.c \ lvm-functions.c \
system-lv.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 endif
TARGETS = \ TARGETS = \
@ -43,15 +38,14 @@ TARGETS = \
include $(top_srcdir)/make.tmpl include $(top_srcdir)/make.tmpl
CFLAGS += -D_REENTRANT -fno-strict-aliasing $(LM_FLAGS) CFLAGS += -D_REENTRANT -fno-strict-aliasing
LIBS += -ldevmapper -llvm -lpthread LIBS += -ldevmapper -llvm -lpthread
INSTALL_TARGETS = \ INSTALL_TARGETS = \
install_clvmd install_clvmd
clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a 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 .PHONY: install_clvmd

2
daemons/clvmd/clvmd.c
View File

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

1
include/.symlinks
View File

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