* [Cluster-devel] conga/ricci configure
@ 2006-07-25 21:49 kupcevic
0 siblings, 0 replies; 4+ messages in thread
From: kupcevic @ 2006-07-25 21:49 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-25 21:49:55
Modified files:
ricci : configure
Log message:
ricci: ./configure: use different command to get dbus version
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/ricci/configure 2006/07/25 19:10:18 1.5
+++ conga/ricci/configure 2006/07/25 21:49:55 1.6
@@ -45,7 +45,7 @@
# D-BUS version
-DBUS_VERSION=`dbus-launch --version | grep D-BUS | sed -e s,^D-BUS\ Message\ Bus\ Launcher\ \\\\\([012]\.[0123456789]*\\\\\),\\\1,`
+DBUS_VERSION=`dbus-cleanup-sockets --version | grep D-BUS | sed -e s,^D-BUS\ Socket\ Cleanup\ Utility\ \\\\\([012]\.[0123456789]*\\\\\),\\\1,`
if [ -z "$DBUS_VERSION" ] ; then
echo "missing d-bus"
rm -f $MAKE_DEFINES
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/ricci configure
@ 2006-08-21 20:13 kupcevic
0 siblings, 0 replies; 4+ messages in thread
From: kupcevic @ 2006-08-21 20:13 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-08-21 20:13:00
Modified files:
ricci : configure
Log message:
d-bus detection failure
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- conga/ricci/configure 2006/07/25 21:49:55 1.6
+++ conga/ricci/configure 2006/08/21 20:13:00 1.7
@@ -45,7 +45,7 @@
# D-BUS version
-DBUS_VERSION=`dbus-cleanup-sockets --version | grep D-BUS | sed -e s,^D-BUS\ Socket\ Cleanup\ Utility\ \\\\\([012]\.[0123456789]*\\\\\),\\\1,`
+DBUS_VERSION=`dbus-cleanup-sockets --version | grep -i D-BUS | sed -e s,^D-B[Uu][Ss]\ Socket\ Cleanup\ Utility\ \\\\\([012]\.[0123456789]*\\\\\),\\\1,`
if [ -z "$DBUS_VERSION" ] ; then
echo "missing d-bus"
rm -f $MAKE_DEFINES
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/ricci configure
@ 2006-11-17 0:31 kupcevic
0 siblings, 0 replies; 4+ messages in thread
From: kupcevic @ 2006-11-17 0:31 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-11-17 00:31:50
Modified files:
ricci : configure
Log message:
ricci: fix D-BUS detection (handle format X.X.X, eg. 1.2.3)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- conga/ricci/configure 2006/08/22 23:01:17 1.8
+++ conga/ricci/configure 2006/11/17 00:31:50 1.9
@@ -45,15 +45,27 @@
# D-BUS version
-DBUS_VERSION=`pkg-config --modversion dbus-1`
+DBUS_VERSION=`pkg-config --modversion dbus-1 2>/dev/null`
if [ -z "$DBUS_VERSION" ] ; then
- echo "missing d-bus"
+ echo "D-BUS required, but I am unable to locate it. Is it installed?"
rm -f $MAKE_DEFINES
exit 1
else
- echo "detected dbus version: $DBUS_VERSION"
- DBUS_MAJOR_VERSION=`echo $DBUS_VERSION | sed -e s,^\\\\\([012]\\\\\)\.[0123456789]*,\\\1,`
- DBUS_MINOR_VERSION=`echo $DBUS_VERSION | sed -e s,^[012]\.\\\\\([0123456789]*\\\\\),\\\1,`
+ echo -n "D-BUS version $DBUS_VERSION detected"
+ VERSIONS=(`echo $DBUS_VERSION | sed -e s,^\\\\\([0123456789]*\\\\\)\.\\\\\([0123456789]*\\\\\).*,\\\1\ \\\2, 2>/dev/null`)
+ DBUS_MAJOR_VERSION=${VERSIONS[0]}
+ DBUS_MINOR_VERSION=${VERSIONS[1]}
+ if [ -z "$DBUS_MAJOR_VERSION" ] ; then
+ echo "; failed extraction of major D-BUS version"
+ rm -f $MAKE_DEFINES
+ exit 1
+ fi
+ if [ -z "$DBUS_MINOR_VERSION" ] ; then
+ echo "; failed extraction of minor D-BUS version"
+ rm -f $MAKE_DEFINES
+ exit 1
+ fi
+ echo ' ->' major $DBUS_MAJOR_VERSION, minor $DBUS_MINOR_VERSION
fi
@@ -65,4 +77,3 @@
| sed -e s,@@DBUS_MINOR_VERSION@@,$DBUS_MINOR_VERSION,g \
| sed -e s,@@PEGASUS_PLATFORM@@,$PEGASUS_PLATFORM,g \
>> $MAKE_DEFINES
-
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] conga/ricci configure
@ 2006-11-17 0:37 kupcevic
0 siblings, 0 replies; 4+ messages in thread
From: kupcevic @ 2006-11-17 0:37 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2006-11-17 00:37:26
Modified files:
ricci : configure
Log message:
ricci: fix D-BUS detection (handle format X.X.X, eg. 1.2.3)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.8&r2=1.8.2.1
--- conga/ricci/configure 2006/08/22 23:01:17 1.8
+++ conga/ricci/configure 2006/11/17 00:37:26 1.8.2.1
@@ -45,15 +45,27 @@
# D-BUS version
-DBUS_VERSION=`pkg-config --modversion dbus-1`
+DBUS_VERSION=`pkg-config --modversion dbus-1 2>/dev/null`
if [ -z "$DBUS_VERSION" ] ; then
- echo "missing d-bus"
+ echo "D-BUS required, but I am unable to locate it. Is it installed?"
rm -f $MAKE_DEFINES
exit 1
else
- echo "detected dbus version: $DBUS_VERSION"
- DBUS_MAJOR_VERSION=`echo $DBUS_VERSION | sed -e s,^\\\\\([012]\\\\\)\.[0123456789]*,\\\1,`
- DBUS_MINOR_VERSION=`echo $DBUS_VERSION | sed -e s,^[012]\.\\\\\([0123456789]*\\\\\),\\\1,`
+ echo -n "D-BUS version $DBUS_VERSION detected"
+ VERSIONS=(`echo $DBUS_VERSION | sed -e s,^\\\\\([0123456789]*\\\\\)\.\\\\\([0123456789]*\\\\\).*,\\\1\ \\\2, 2>/dev/null`)
+ DBUS_MAJOR_VERSION=${VERSIONS[0]}
+ DBUS_MINOR_VERSION=${VERSIONS[1]}
+ if [ -z "$DBUS_MAJOR_VERSION" ] ; then
+ echo "; failed extraction of major D-BUS version"
+ rm -f $MAKE_DEFINES
+ exit 1
+ fi
+ if [ -z "$DBUS_MINOR_VERSION" ] ; then
+ echo "; failed extraction of minor D-BUS version"
+ rm -f $MAKE_DEFINES
+ exit 1
+ fi
+ echo ' ->' major $DBUS_MAJOR_VERSION, minor $DBUS_MINOR_VERSION
fi
@@ -65,4 +77,3 @@
| sed -e s,@@DBUS_MINOR_VERSION@@,$DBUS_MINOR_VERSION,g \
| sed -e s,@@PEGASUS_PLATFORM@@,$PEGASUS_PLATFORM,g \
>> $MAKE_DEFINES
-
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-11-17 0:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-25 21:49 [Cluster-devel] conga/ricci configure kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-08-21 20:13 kupcevic
2006-11-17 0:31 kupcevic
2006-11-17 0:37 kupcevic
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).