Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=940d8896eb1... Commit: 940d8896eb1ef1056ea752ac45cb332314ca68ba Parent: fc2ec0d6841352ccbd9fddddeaa17de44a65261b Author: Fabio M. Di Nitto fdinitto@redhat.com AuthorDate: Wed Nov 3 22:33:19 2010 +0100 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Wed Nov 3 22:33:19 2010 +0100
build: drop cman/pacemaker configure options
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com --- configure.ac | 38 ++++++--------------------------- group/dlm_controld/Makefile.am | 45 +++++++++++++++------------------------ 2 files changed, 24 insertions(+), 59 deletions(-)
diff --git a/configure.ac b/configure.ac index 488f3eb..f1c1ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,8 @@ AM_PROG_CC_C_O AC_PROG_LN_S AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_CXX +AC_PROG_RANLIB
## local helper functions
@@ -103,18 +105,6 @@ AC_ARG_WITH([sysloglevel], [ SYSLOGLEVEL="$withval" ], [ SYSLOGLEVEL="LOG_INFO" ])
-AC_ARG_ENABLE([pacemaker], - [ --enable-pacemaker enable dlm_controld pacemaker build. ], - [ default="no" ]) - -AC_ARG_ENABLE([cman], - [ --enable-cman enable dlm_controld cman build. ],, - [ enable_cman="yes" ]) - -if test "x${enable_pacemaker}" = xno && test "x${enable_cman}" = xno; then - AC_MSG_ERROR([At least one dlm_controld build method (cman or pacemaker) has to be selected]) -fi - AC_ARG_WITH([kernel], [ --with-kernel=path path to kernel source. ], [ KERNEL_DIR="$withval" ], @@ -126,22 +116,11 @@ PKG_CHECK_MODULES([corosync],[corosync]) PKG_CHECK_MODULES([cpg],[libcpg]) PKG_CHECK_MODULES([sackpt],[libSaCkpt]) PKG_CHECK_MODULES([logt],[liblogthread]) - -if test "x${enable_pacemaker}" = xyes; then - PKG_CHECK_MODULES([totempg],[libtotem_pg]) - PKG_CHECK_MODULES([xml],[libxml-2.0]) - PKG_CHECK_MODULES([glib],[glib-2.0]) - check_lib_no_libs cib cib_new - check_lib_no_libs crmcluster crm_set_status_callback - check_lib_no_libs crmcommon init_server_ipc_comms -fi - -if test "x${enable_cman}" = xyes; then - PKG_CHECK_MODULES([ccs],[libccs]) - PKG_CHECK_MODULES([cfg],[libcfg]) - PKG_CHECK_MODULES([quorum],[libquorum]) - PKG_CHECK_MODULES([fenced],[libfenced]) -fi +PKG_CHECK_MODULES([ccs],[libccs]) +PKG_CHECK_MODULES([cfg],[libcfg]) +PKG_CHECK_MODULES([confdb],[libconfdb]) +PKG_CHECK_MODULES([quorum],[libquorum]) +PKG_CHECK_MODULES([fenced],[libfenced])
# external libs (no pkgconfig) check_lib_no_libs pthread pthread_mutex_lock @@ -213,9 +192,6 @@ AC_DEFINE_UNQUOTED([SYSLOGFACILITY], $(eval echo ${SYSLOGFACILITY}), AC_DEFINE_UNQUOTED([SYSLOGLEVEL], $(eval echo ${SYSLOGLEVEL}), [Default syslog level])
-AM_CONDITIONAL(ENABLE_PACEMAKER, test "x${enable_pacemaker}" = xyes) -AM_CONDITIONAL(ENABLE_CMAN, test "x${enable_cman}" = xyes) - ## *FLAGS handling
ENV_CFLAGS="$CFLAGS" diff --git a/group/dlm_controld/Makefile.am b/group/dlm_controld/Makefile.am index 8eb6186..a10e236 100644 --- a/group/dlm_controld/Makefile.am +++ b/group/dlm_controld/Makefile.am @@ -1,46 +1,35 @@ MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = - -if ENABLE_CMAN -sbin_PROGRAMS += dlm_controld -endif +sbin_PROGRAMS = dlm_controld
noinst_HEADERS = config.h dlm_controld.h dlm_daemon.h
-shared_SOURCES = action.c cpg.c crc.c deadlock.c main.c \ - netlink.c plock.c +dlm_controld_SOURCES = action.c cpg.c crc.c deadlock.c main.c \ + netlink.c plock.c config.c member_cman.c \ + logging.c
-shared_CPPFLAGS = -I$(top_srcdir)/dlm/libdlm \ +dlm_controld_CPPFLAGS = -I$(top_srcdir)/dlm/libdlm \ -I$(top_srcdir)/dlm/libdlmcontrol \ -I$(top_srcdir)/group/include
-shared_CFLAGS = $(logt_CFLAGS) $(cpg_CFLAGS) $(sackpt_CFLAGS) - -shared_LIBS = $(logt_LIBS) $(cpg_LIBS) $(sackpt_LIBS) -lpthread - -shared_LDADD = $(top_builddir)/dlm/libdlm/libdlm.la \ - $(top_builddir)/dlm/libdlmcontrol/libdlmcontrol.la - -if ENABLE_CMAN - -dlm_controld_SOURCES = $(shared_SOURCES) \ - config.c member_cman.c logging.c - -dlm_controld_CPPFLAGS = $(shared_CPPFLAGS) - -dlm_controld_CFLAGS = $(shared_CFLAGS) \ +dlm_controld_CFLAGS = $(logt_CFLAGS) \ + $(cpg_CFLAGS) \ + $(sackpt_CFLAGS) \ + $(confdb_CFLAGS) $(ccs_CFLAGS) \ $(fenced_CFLAGS) \ $(cfg_CFLAGS) \ $(quorum_CFLAGS)
-dlm_controld_LDFLAGS = $(shared_LIBS) \ +dlm_controld_LDFLAGS = $(logt_LIBS) \ + $(cpg_LIBS) \ + $(sackpt_LIBS) \ + $(confdb_LIBS) \ $(ccs_LIBS) \ $(fenced_LIBS) \ $(cfg_LIBS) \ - $(quorum_LIBS) + $(quorum_LIBS) \ + -lpthread
-dlm_controld_LDADD = $(shared_LDADD) - -endif +dlm_controld_LDADD = $(top_builddir)/dlm/libdlm/libdlm.la \ + $(top_builddir)/dlm/libdlmcontrol/libdlmcontrol.la