From: cfeist@sourceware.org <cfeist@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/fence/agents/xvm Makefile fence_xvmd.c ...
Date: 5 Oct 2006 22:57:47 -0000 [thread overview]
Message-ID: <20061005225747.30452.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: cfeist at sourceware.org 2006-10-05 22:57:47
Modified files:
fence/agents/xvm: Makefile fence_xvmd.c virt.c virt.h
Log message:
Update building for xvm fence agent to build cleanly in brew.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvmd.c.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/virt.c.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/virt.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- cluster/fence/agents/xvm/Makefile 2006/10/05 16:11:36 1.1
+++ cluster/fence/agents/xvm/Makefile 2006/10/05 22:57:47 1.2
@@ -23,13 +23,14 @@
INCLUDE=-I${top_srcdir}/include -I${top_srcdir}/config \
-I/usr/include/openais -I/usr/include/libvirt \
- -I/usr/include/nss3 -I/usr/include/nspr4
+ -I/usr/include/nss3 -I/usr/include/nspr4 \
+ -I../../../cman/lib
CFLAGS+=-DFENCE_RELEASE_NAME=\"${RELEASE}\" \
-Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
-LIBS+=-L../../../cman/lib -L../../../ccs/lib -L/usr/lib/openais \
- -lccs -lcman -ldlm -lnss3 -lvirt -lSaCkpt
+LIBS+=-L../../../cman/lib -L../../../ccs/lib -L${libdir}/openais \
+ -L../../../dlm/lib -lccs -lcman -ldlm -lnss3 -lvirt -lSaCkpt
all: ${TARGETS}
--- cluster/fence/agents/xvm/fence_xvmd.c 2006/10/05 18:48:58 1.2
+++ cluster/fence/agents/xvm/fence_xvmd.c 2006/10/05 22:57:47 1.3
@@ -40,7 +40,6 @@
#include <errno.h>
#include <pthread.h>
#include <virterror.h>
-#include <libcman.h>
#include <nss.h>
#include <libgen.h>
@@ -51,6 +50,7 @@
#include "mcast.h"
#include "tcp.h"
#include "virt.h"
+#include "libcman.h"
static int running = 1;
--- cluster/fence/agents/xvm/virt.c 2006/10/05 16:11:36 1.1
+++ cluster/fence/agents/xvm/virt.c 2006/10/05 22:57:47 1.2
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
-#include <libvirt.h>
+#include <libvirt/libvirt.h>
#include <string.h>
#include <malloc.h>
#include <stdint.h>
--- cluster/fence/agents/xvm/virt.h 2006/10/05 16:11:36 1.1
+++ cluster/fence/agents/xvm/virt.h 2006/10/05 22:57:47 1.2
@@ -18,7 +18,7 @@
*/
#ifndef _VIRT_H
#define _VIRT_H
-#include <libvirt.h>
+#include <libvirt/libvirt.h>
#include <stdint.h>
#include <netinet/in.h>
next reply other threads:[~2006-10-05 22:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-05 22:57 cfeist [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-06-26 17:17 [Cluster-devel] cluster/fence/agents/xvm Makefile fence_xvmd.c lhh
2007-06-26 17:23 lhh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061005225747.30452.qmail@sourceware.org \
--to=cfeist@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.