From 5401618f546c8486c99491f32139638ffb3ea45d Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 21 Jan 2016 15:15:39 +0300 Subject: configure.ac: no need to parse and print dbus version anymore --- configure.ac | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c00c510..0012e5e 100644 --- a/configure.ac +++ b/configure.ac @@ -141,40 +141,6 @@ PKG_CHECK_MODULES(MATE_SCREENSAVER_SAVER, $SAVER_MODULES) AC_SUBST(MATE_SCREENSAVER_SAVER_CFLAGS) AC_SUBST(MATE_SCREENSAVER_SAVER_LIBS) -# Find out the version of DBUS we're using - -dbus_version=`pkg-config --modversion dbus-1` -DBUS_VERSION_MAJOR=`echo $dbus_version | awk -F. '{print $1}'` -DBUS_VERSION_MINOR=`echo $dbus_version | awk -F. '{print $2}'` -DBUS_VERSION_MICRO=`echo $dbus_version | awk -F. '{print $3}'` -if test "z$DBUS_VERSION_MAJOR" = "z"; then - DBUS_VERSION_MAJOR="0" -fi -if test "z$DBUS_VERSION_MINOR" = "z"; then - DBUS_VERSION_MINOR="0" -fi -if test "z$DBUS_VERSION_MICRO" = "z"; then - DBUS_VERSION_MICRO="0" -fi - -if test "z$DBUS_VERSION_MAJOR" = "z0" -a "z$DBUS_VERSION_MINOR" = "z0" -a "z$DBUS_VERSION_MICRO" = "z0"; then echo "Error: Couldn't determine the version of your DBUS package." - echo " This is probably an error in this script, please report it" - echo " along with the following information:" - echo " Base DBUS version ='$dbus_version'" - echo " DBUS_VERSION_MAJOR='$DBUS_VERSION_MAJOR'" - echo " DBUS_VERSION_MINOR='$DBUS_VERSION_MINOR'" - echo " DBUS_VERSION_MICRO='$DBUS_VERSION_MICRO'" - exit 1 -else - - echo "Your dbus version is $DBUS_VERSION_MAJOR.$DBUS_VERSION_MINOR.$DBUS_VERSION_MICRO." - DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR" - DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR" - DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO" - - AC_SUBST(DBUS_CFLAGS) -fi - # Find out where the session service file goes # The sad sed hack is recomended by section 27.10 of the automake manual. DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'` -- cgit v1.2.1