xchat-gnome r2656 - trunk

[chpe svn gnome org]

Author: chpe
Date: Sun Sep  7 13:57:10 2008
New Revision: 2656
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2656&view=rev

Log:
	* configure.ac: Make libcanberra and libnotify explict dependencies
	with a --disable switch, instead of automatic dependencies.

Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Sep  7 13:57:10 2008
@@ -1,4 +1,4 @@
-AC_INIT([XChat-GNOME IRC Chat],[0.19svn],[http://bugzilla.gnome.org/enter_bug.cgi?product=xchat-gnome],[xchat-gnome])
+AC_INIT([XChat-GNOME IRC Chat],[0.23.92],[http://bugzilla.gnome.org/enter_bug.cgi?product=xchat-gnome],[xchat-gnome])
 
 AC_PREREQ([2.60])
 
@@ -6,7 +6,7 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 check-news subdir-objects])
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip subdir-objects])
 
 AM_MAINTAINER_MODE
 if test "$enable_maintainer_mode" = "yes"; then
@@ -16,8 +16,8 @@
 
 IT_PROG_INTLTOOL([0.35.0])
 
-GLIB_REQUIRED=2.16.0
-GTK_REQUIRED=2.13.7
+GLIB_REQUIRED=2.18.0
+GTK_REQUIRED=2.14.0
 LIBGLADE_REQUIRED=2.3.2
 LIBGNOME_REQUIRED=2.16.0
 LIBGNOMEUI_REQUIRED=2.16.0
@@ -109,24 +109,36 @@
 
 AM_CONDITIONAL([ENABLE_DBUS],[test "x$dbus" = "xyes"])
 
-# libnotify soft dependency
-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
-AC_SUBST([LIBNOTIFY_CFLAGS])
-AC_SUBST([LIBNOTIFY_LIBS])
-AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"])
-if test "x$libnotify" != "xyes"; then
-	AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
-fi
-
-# libcanberra-gtk soft dependency
-PKG_CHECK_MODULES([LIBCANBERRAGTK], [libcanberra-gtk >= $LIBCANBERRAGTK_REQUIRED], libcanberra=yes, libcanberra=no)
-AC_SUBST([LIBCANBERRAGTK_CFLAGS])
-AC_SUBST([LIBCANBERRAGTK_LIBS])
-AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "x$libcanberra" = "xyes"])
-if test "x$libcanberra" != "xyes"; then
-        AC_MSG_WARN([Library requirements (libcanberra-gtk >= $LIBCANBERRAGTK_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
+# libnotify
+AC_MSG_CHECKING([whether to notification sounds using libnotify])
+AC_ARG_ENABLE([notification],
+  [AS_HELP_STRING([--disable-notification],[whether to disable libnotify support])],
+  [],[enable_notification=yes])
+AC_MSG_RESULT([$enable_notification])
+
+if test "$enable_notification" = "yes"; then
+  PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED])
+  AC_SUBST([LIBNOTIFY_CFLAGS])
+  AC_SUBST([LIBNOTIFY_LIBS])
+fi
+
+AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "$enable_notification" = "yes"])
+
+# libcanberra-gtk
+AC_MSG_CHECKING([whether to enable notification sounds using libcanberra])
+AC_ARG_ENABLE([canberra],
+  [AS_HELP_STRING([--disable-canberra],[whether to disable libcanberra support])],
+  [],[enable_canberra=yes])
+AC_MSG_RESULT([$enable_canberra])
+
+if test "$enable_canberra" = "yes"; then
+  PKG_CHECK_MODULES([LIBCANBERRAGTK],[libcanberra-gtk >= $LIBCANBERRAGTK_REQUIRED])
+  AC_SUBST([LIBCANBERRAGTK_CFLAGS])
+  AC_SUBST([LIBCANBERRAGTK_LIBS])
 fi
 
+AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "$enable_canberra" = "yes"])
+
 # GConf
 AM_GCONF_SOURCE_2
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)