xchat-gnome r2671 - trunk

[sbacher svn gnome org]

Author: sbacher
Date: Tue Sep  9 22:52:52 2008
New Revision: 2671
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2671&view=rev

Log:
2008-09-10  Sebastien Bacher  <seb128 ubuntu com>

	* configure.ac: correctly set the libnotify and libcanberra options 
          (bug #551515)


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Sep  9 22:52:52 2008
@@ -122,7 +122,7 @@
   AC_SUBST([LIBNOTIFY_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "$enable_notification" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$enable_notification" = "xyes"])
 
 # libcanberra-gtk
 AC_MSG_CHECKING([whether to enable notification sounds using libcanberra])
@@ -137,7 +137,7 @@
   AC_SUBST([LIBCANBERRAGTK_LIBS])
 fi
 
-AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "$enable_canberra" = "yes"])
+AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "x$enable_canberra" = "xyes"])
 
 # GConf
 AM_GCONF_SOURCE_2
@@ -359,7 +359,7 @@
 DIST_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS $DBUS_PLUGINS $LIBNOTIFY_PLUGINS $PYTHON_PLUGINS $PERL_PLUGINS $TCL_PLUGINS"
 
 # canberra specific plugins
-if test "x$libcanberra" = "xyes"; then
+if test "x$enable_canberra" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $CANBERRA_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libcanberra support, plugins $CANBERRA_PLUGINS will not be available])
@@ -373,7 +373,7 @@
 fi
 
 # libnotify-specific plugins
-if test "x$libnotify" = "xyes"; then
+if test "x$enable_notification" = "xyes"; then
 	ALL_PLUGINS="$ALL_PLUGINS $LIBNOTIFY_PLUGINS"
 else
 	AC_MSG_WARN([xchat-gnome compiled without libnotify support, plugins $LIBNOTIFY_PLUGINS will not be available])