From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...
Date: 22 Aug 2006 23:01:18 -0000 [thread overview]
Message-ID: <20060822230118.14550.qmail@sourceware.org> (raw)
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}
next reply other threads:[~2006-08-22 23:01 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-22 23:01 kupcevic [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-29 19:47 [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. rmccabe
2008-07-28 17:49 rmccabe
2008-05-12 15:13 rmccabe
2008-04-18 3:31 rmccabe
2008-04-11 6:54 rmccabe
2008-04-11 6:48 rmccabe
2008-04-07 20:11 rmccabe
2008-02-12 17:40 rmccabe
2008-01-29 22:02 rmccabe
2007-08-20 16:23 rmccabe
2007-08-13 19:06 rmccabe
2007-08-09 22:02 rmccabe
2007-08-08 21:24 rmccabe
2007-06-27 7:43 rmccabe
2007-05-01 15:57 rmccabe
2007-04-11 20:15 rmccabe
2007-04-11 19:23 rmccabe
2007-03-20 20:52 kupcevic
2007-02-07 1:36 kupcevic
2007-02-05 22:01 kupcevic
2007-02-05 20:08 rmccabe
2007-02-05 12:12 kupcevic
2007-01-23 22:34 kupcevic
2007-01-17 16:36 kupcevic
2007-01-17 14:57 kupcevic
2007-01-17 14:32 kupcevic
2006-12-13 19:21 kupcevic
2006-12-12 13:53 kupcevic
2006-11-17 20:46 kupcevic
2006-11-17 0:59 kupcevic
2006-11-16 19:35 kupcevic
2006-11-02 0:46 rmccabe
2006-11-01 23:11 kupcevic
2006-11-01 20:43 rmccabe
2006-10-31 20:34 kupcevic
2006-10-25 18:47 rmccabe
2006-10-25 16:35 kupcevic
2006-10-16 21:01 kupcevic
2006-10-16 15:56 kupcevic
2006-10-04 16:32 kupcevic
2006-09-26 5:21 kupcevic
2006-08-22 20:12 kupcevic
2006-08-16 6:34 kupcevic
2006-08-15 4:15 kupcevic
2006-08-09 21:13 kupcevic
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=20060822230118.14550.qmail@sourceware.org \
--to=kupcevic@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).