Minor build cleanups

Signed-off-by: Lon Hohberger <lhh@redhat.com>

build

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+sh ./autogen.sh
+
+if [ "`uname -m`" = "x86_64" ]; then
+	LIBDIR=/usr/lib64
+else
+	LIBDIR=/usr/lib
+fi
+
+./configure --prefix=/ --libdir=$LIBDIR

server/Makefile.in

@@ -23,16 +23,15 @@ null_so_SOURCES = null.c
 multicast_so_SOURCES = mcast.c history.c
 checkpoint_so_SOURCES = virt.c vm_states.c history.c checkpoint.c
 
-INCLUDES=-I../include -I/usr/include/openais -I/usr/include/libvirt \
-	-I/usr/include/nss3 -I/usr/include/nspr4
+INCLUDES=-I../include `nss-config --cflags` `nspr-config --cflags`
 
 CFLAGS+=-DFENCE_RELEASE_NAME=\"devel\" -D_MODULE -DSYSCONFDIR=\"@sysconfdir@\"
 
 LIBS+=-L../common -lfence_virt -Wl,-wrap,syslog,-wrap,closelog -lpthread
       
 MAIN_LIBS=-L../config -lsimpleconfig -ldl
-AIS_LIBS=-L/usr/lib64/openais -lSaCkpt		# XXX FIXME
-COROSYNC_LIBS=-L/usr/lib64/corosync -lcpg	
+AIS_LIBS=-L@libdir@/openais -lSaCkpt
+COROSYNC_LIBS=-L@libdir@/corosync -lcpg	
 VIRT_LIBS=-lvirt
 NSS_LIBS=-lnss3
 

server/checkpoint.c

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <errno.h>
-#include <libvirt.h>
+#include <libvirt/libvirt.h>
 #ifdef HAVE_OPENAIS_CPG_H
 #include <openais/cpg.h>
 #else

server/libvirt.c

@@ -40,7 +40,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <pthread.h>
-#include <virterror.h>
+#include <libvirt/virterror.h>
 #include <nss.h>
 #include <libgen.h>
 #include <syslog.h>

server/vm_states.c

@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <pthread.h>
-#include <saAis.h>
-#include <saCkpt.h>
+#include <openais/saAis.h>
+#include <openais/saCkpt.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>