Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by lars from ([email protected])
2. Linux-HA CVS: linux-ha by lars from
([email protected])
3. Linux-HA CVS: cim by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 12 Dec 2005 13:17:26 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
Makefile.am
Log Message:
Add $DESTDIR to the right place.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 12 Dec 2005 19:58:29 -0000 1.7
+++ Makefile.am 12 Dec 2005 20:17:26 -0000 1.8
@@ -30,11 +30,11 @@
LRM_DIR = lrm
-pamdir = $(DESTDIR)/etc/pam.d
+pamdir = /etc/pam.d
pam_DATA = mgmtd.pam
install-data-hook:
- mv $(pamdir)/mgmtd.pam $(pamdir)/mgmtd
+ mv $(DESTDIR)$(pamdir)/mgmtd.pam $(DESTDIR)$(pamdir)/mgmtd
halib_PROGRAMS = mgmtd
------------------------------
Message: 2
Date: Mon, 12 Dec 2005 14:33:42 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Typos and a redundant configuration directive.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -3 -r1.477 -r1.478
--- configure.in 12 Dec 2005 05:14:48 -0000 1.477
+++ configure.in 12 Dec 2005 21:33:41 -0000 1.478
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.477 $) dnl cvs revision
+AC_REVISION($Revision: 1.478 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1055,17 +1055,18 @@
dnl ***************************************************************************
dnl CIM provider configuration
dnl ***************************************************************************
-AC_ARG_ENABLE([cim],
- [ --enable-cim-provider Build CIM providers [[default=no]]],
- [], [])
+AC_ARG_ENABLE([cim-provider],
+[ --enable-cim-provider Enable CIM providers.
+ [default=no]])
+
AC_ARG_WITH([cimom],
- [ --with-cimom Sepecify CIM server], [], [])
+ [ --with-cimom Specify CIM server], [], [])
AC_ARG_WITH([cmpiheader],
- [ --with-cmpi-headers Sepecify CMPI header files], [], [])
+ [ --with-cmpi-headers Specify CMPI header files], [], [])
AC_ARG_WITH([cmpiprovider],
- [ --with-provider-dir Sepecify CMPI providers directory], [], [])
+ [ --with-provider-dir Specify CMPI providers directory], [], [])
CMPI_HEADER_PATH=${with_cmpi_headers}
CIMOM=${with_cimom}
@@ -1412,10 +1413,6 @@
[], [enable_ldirectord=yes])
AM_CONDITIONAL(LDIRECTORD_BUILD, test "X$enable_ldirectord" = "Xyes")
-AC_ARG_ENABLE([cim-provider],
-[ --enable-cim-provider Enable CIM providers.
- [default=no]])
-
AC_ARG_ENABLE([thread-safe],
[ --enable-thread-safe Enable some client libraries to be thread safe.
[default=no]])
------------------------------
Message: 3
Date: Mon, 12 Dec 2005 14:57:41 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
Makefile.am
Log Message:
If the path to the CMPI headers isn't part of the include search path,
the other headers may not be includeable. Simplified Makefile.am
(because it's now always -Included).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 4 Nov 2005 07:13:46 -0000 1.9
+++ Makefile.am 12 Dec 2005 21:57:41 -0000 1.10
@@ -38,8 +38,6 @@
#THREADLIB = `pkg-config --libs gthread-2.0`
THREADLIB = lpthread
-CMPIHEADERS = $(CMPI_HEADER_PATH)
-
cimprovidersdir = $(CMPI_PROVIDER_DIR)
noinst_HEADERS = cmpi_utils.h \
@@ -70,34 +68,28 @@
#--------------------------------------------------------------
liblinuxha_info_la_SOURCES = linuxha_info.c
-liblinuxha_info_la_CFLAGS = -I$(CMPIHEADERS)
liblinuxha_info_la_LDFLAGS = $(COMMONLIBS)
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterProvider_la_SOURCES = cmpi_utils.c cmpi_cluster.c
cmpi_cluster_provider.c
-libcmpiLinuxHA_ClusterProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterProvider_la_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_SoftwareIdentityProvider_la_SOURCES = cmpi_utils.c
cmpi_software_identity_provider.c
-libcmpiLinuxHA_SoftwareIdentityProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_SoftwareIdentityProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceProvider_la_SOURCES = cmpi_utils.c
cmpi_resource.c ha_resource.c \
cmpi_resource_provider.c
-libcmpiLinuxHA_ClusterResourceProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterNodeProvider_la_SOURCES = cmpi_utils.c cmpi_node.c
cmpi_node_provider.c
-libcmpiLinuxHA_ClusterNodeProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterNodeProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ParticipatingNodeProvider_la_SOURCES = cmpi_utils.c \
cmpi_participating_node_provider.c
-libcmpiLinuxHA_ParticipatingNodeProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ParticipatingNodeProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
@@ -105,50 +97,42 @@
libcmpiLinuxHA_HostedResourceProvider_la_SOURCES = cmpi_utils.c
\
cmpi_hosted_resource.c
\
cmpi_hosted_resource_provider.c
-libcmpiLinuxHA_HostedResourceProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_HostedResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_SOURCES = cmpi_utils.c \
cmpi_installed_software_provider.c
-libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceInstanceProvider_la_SOURCES = cmpi_utils.c \
cmpi_rsc_instance_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterResourceInstanceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_SOURCES = cmpi_utils.c \
cmpi_rsc_attribute_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_CFLAGS =
-I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceGroupProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
cmpi_rsc_group.c
\
cmpi_rsc_group_provider.c
-libcmpiLinuxHA_ClusterResourceGroupProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_ClusterResourceGroupProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_SubResourceProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
cmpi_sub_resource.c
\
cmpi_sub_resource_provider.c
-libcmpiLinuxHA_SubResourceProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_SubResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_IndicationProvider_la_SOURCES = cmpi_utils.c
cmpi_ha_indication.c \
cmpi_ha_indication_provider.c
-libcmpiLinuxHA_IndicationProvider_la_CFLAGS = -I$(CMPIHEADERS)
libcmpiLinuxHA_IndicationProvider_la_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
#--------------------------------------------------------------
noinst_PROGRAMS = simpledemo
simpledemo_SOURCES = ha_resource.c cmpi_utils.c simple_demo.c
-simpledemo_CFLAGS = -I$(CMPIHEADERS)
simpledemo_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 29
********************************************
