[Xfce4-commits] <xfce4-sensors-plugin:master> make distinction between the two libnotify versions more explicit for the configure process

[Fabian]

Updating branch refs/heads/master
         to 9935d8391c4ce31bc8334f9155518728e64aa3a1 (commit)
       from 2eeeb1b0a82b68a4b49b19ccf145966aec947173 (commit)

commit 9935d8391c4ce31bc8334f9155518728e64aa3a1
Author: Fabian <timystery at arcor.de>
Date:   Mon May 9 22:10:04 2011 +0200

    make distinction between the two libnotify versions more explicit for the configure process

 Makefile.am     |    2 +-
 configure.in.in |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index adf5054..b76342c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ DISTCLEANFILES =						\
 	xfce4-sensors-plugin.spec
 
 DISTCHECK_CONFIGURE_FLAGS =		\
-	--enable-notification				\
+	--enable-notification4				\
 	--enable-libsensors					\
 	--enable-hddtemp						\
 	--enable-procacpi						\
diff --git a/configure.in.in b/configure.in.in
index 8c88264..9e3b37c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -14,7 +14,7 @@ m4_define([xfce4_sensors_version_minor], [2])
 m4_define([xfce4_sensors_version_micro], [0])
 m4_define([xfce4_sensors_version_nano], [])
 m4_define([xfce4_sensors_version_build], [@REVISION@])
-m4_define([xfce4_sensors_version_tag], [git])
+m4_define([xfce4_sensors_version_tag], []) dnl may be set to 'git'
 m4_define([xfce4_sensors_version], [xfce4_sensors_version_major().xfce4_sensors_version_minor().xfce4_sensors_version_micro()ifelse(xfce4_sensors_version_nano(), [], [], [.xfce4_sensors_version_nano()])ifelse(xfce4_sensors_version_tag(), [git], [xfce4_sensors_version_tag()-xfce4_sensors_version_build()], [xfce4_sensors_version_tag()])])
 
 
@@ -336,12 +336,12 @@ dnl **************************************
 dnl XDT_CHECK_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0])
 XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY4],
                            [libnotify],
-                           [0.4], [notification],
+                           [0.4], [notification4],
                            [notification message library < 0.7])
 
 XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY7],
                            [libnotify],
-                           [0.7], [notification],
+                           [0.7], [notification7],
                            [notification message library >= 0.7])
 
 dnl **************************************