[Cluster-devel] conga/ricci configure

[kupcevic at sourceware.org]

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
-