[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-22 23:01:17

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	ricci          : configure 
	ricci/make     : defines.mk.in 
	ricci/ricci    : Makefile 

Log message:
	ricci build: use pkgconfig for libs detection

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- conga/clustermon.spec.in.in	2006/08/22 20:12:38	1.11
+++ conga/clustermon.spec.in.in	2006/08/22 23:01:17	1.12
@@ -30,7 +30,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
-BuildRequires: openssl-devel dbus-devel pam-devel
+BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
--- conga/conga.spec.in.in	2006/08/22 20:12:38	1.37
+++ conga/conga.spec.in.in	2006/08/22 23:01:17	1.38
@@ -40,7 +40,7 @@
 BuildRequires: python-devel >= 2.4.1
 %endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: openssl-devel dbus-devel pam-devel
+BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 
 %description
 Conga is a project developing management system for remote stations. 
--- conga/ricci/configure	2006/08/21 20:13:00	1.7
+++ conga/ricci/configure	2006/08/22 23:01:17	1.8
@@ -45,7 +45,7 @@
 
 
 # D-BUS version
-DBUS_VERSION=`dbus-cleanup-sockets --version | grep -i D-BUS | sed -e s,^D-B[Uu][Ss]\ Socket\ Cleanup\ Utility\ \\\\\([012]\.[0123456789]*\\\\\),\\\1,`
+DBUS_VERSION=`pkg-config --modversion dbus-1`
 if [ -z "$DBUS_VERSION" ] ; then 
     echo "missing d-bus"
     rm -f $MAKE_DEFINES
--- conga/ricci/make/defines.mk.in	2006/07/25 19:10:18	1.5
+++ conga/ricci/make/defines.mk.in	2006/08/22 23:01:17	1.6
@@ -35,10 +35,14 @@
 
 PEGASUS_PLATFORM  ?= @@PEGASUS_PLATFORM@@
 
-INCLUDE         += -I $(top_srcdir)/include `xml2-config --cflags`
+INCLUDE         += -I $(top_srcdir)/include \
+			`pkg-config --cflags libxml-2.0` \
+			`pkg-config --cflags openssl`
 CFLAGS          += -Wall -Wno-unused -fPIC -g ${INCLUDE}
 CXXFLAGS        += -Wall -Wno-unused -fPIC -g ${INCLUDE}
-LDFLAGS         += -fPIC `xml2-config --libs` -lssl -lpthread ${top_srcdir}/common/*.o
+LDFLAGS         += -fPIC -lpthread ${top_srcdir}/common/*.o \
+			`pkg-config --libs libxml-2.0` \
+			`pkg-config --libs openssl`
 
 CC              = gcc
 CXX             = g++
--- conga/ricci/ricci/Makefile	2006/08/16 06:34:20	1.15
+++ conga/ricci/ricci/Makefile	2006/08/22 23:01:17	1.16
@@ -38,10 +38,10 @@
 #OBJECTS = ssl_test.o
 
 
-INCLUDE     += -I ${includedir}/dbus-1.0 -I ${libdir}/dbus-1.0/include
+INCLUDE     += `pkg-config --cflags dbus-1`
 CFLAGS      += 
 CXXFLAGS    += -DDBUS_MAJOR_VERSION="${dbus_major_version}" -DDBUS_MINOR_VERSION="${dbus_minor_version}"
-LDFLAGS     += -l dbus-1 
+LDFLAGS     += `pkg-config --libs dbus-1`
 
 
 all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER}