diff options
| author | monsta <[email protected]> | 2016-01-21 15:15:39 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-21 15:15:39 +0300 |
| commit | 5401618f546c8486c99491f32139638ffb3ea45d (patch) | |
| tree | 8064839015d40f2b63cb31306c61846a4a10dfb7 | |
| parent | 2d7ff68afb228f3a8d34f227c68f9a9b743fb915 (diff) | |
| download | mate-screensaver-5401618f546c8486c99491f32139638ffb3ea45d.tar.bz2 mate-screensaver-5401618f546c8486c99491f32139638ffb3ea45d.tar.xz | |
configure.ac: no need to parse and print dbus version anymore
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 0 insertions, 34 deletions
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'` |