pidgin: 91551db1: Patch from Gabriel Schulhof to correctly...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 91551db10082a93620ed4292ae5502a7eefb52f3
Ancestor: 38836a6fb6223fe51eb9fbea43f15513c5ce577b
Author: nix at go-nix.ca
Date: 2010-01-17T00:59:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/91551db10082a93620ed4292ae5502a7eefb52f3

Modified files:
        ChangeLog configure.ac

ChangeLog: 

Patch from Gabriel Schulhof to correctly disable all missing dependencies
if --disable-missing-dependencies is passed to configure. In some cases,
this would only result in incorrect output from configure (yes, instead of
no), but I think a few cases would probably not compile.

Fixes #10623.

-------------- next part --------------
============================================================
--- ChangeLog	683cc24a30fa86f6bbd1baf840e49dea7b630df4
+++ ChangeLog	4ecc9bbda462b67ad36a92cdb1cd3064f3a6e3aa
@@ -4,6 +4,10 @@ version 2.6.6 (??/??/20??):
 	libpurple:
 	* Fix 'make check' on OS X. (David Fang)
 
+	General:
+	* Correctly disable all missing dependencies when using the
+	  --disable-missing-dependencies option.  (Gabriel Schulhof)
+
 	Gadu-Gadu:
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
============================================================
--- configure.ac	66a637908035eae6be0c29ec05a58035fefe43c2
+++ configure.ac	14057b86b0332b70dee18e9f9d1bf8c6ae5c2842
@@ -426,6 +426,7 @@ running configure.
 					X11_LIBS="$x_libpath_add"
 					X11_CFLAGS="$x_incpath_add"
 				else
+					with_x="no"
 					if test "x$force_deps" = "xyes" ; then
 						AC_MSG_ERROR([
 X11 development headers not found.
@@ -528,6 +529,7 @@ Use --disable-sm if you do not need sess
 	if test "x$enable_startup_notification" = "xyes"; then
 		PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [
 			AC_MSG_RESULT(no)
+			enable_startup_notification="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 Startup notification development headers not found.
@@ -548,6 +550,7 @@ Use --disable-startup-notification if yo
 	if test "x$enable_gtkspell" = "xyes" ; then
 		PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
 			AC_MSG_RESULT(no)
+			enable_gtkspell="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 GtkSpell development headers not found.
@@ -598,6 +601,7 @@ Use --disable-gevolution if you do not n
 	if test "x$enable_cap" = "xyes"; then
 		PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[
 			AC_MSG_RESULT(no)
+			enable_cap="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 sqlite3 development headers not found.
@@ -746,6 +750,7 @@ if test "x$enable_gst" != "xno"; then
 			[], [$GSTREAMER_LIBS])
 	], [
 		AC_MSG_RESULT(no)
+		enable_gst="no"
 		if test "x$force_deps" = "xyes" ; then
 			AC_MSG_ERROR([
 GStreamer development headers not found.
@@ -826,6 +831,7 @@ if test "x$enable_idn" != "xno"; then
 		AC_SUBST(IDN_LIBS)
 	], [
 		AC_MSG_RESULT(no)
+		enable_idn="no"
 		if test "x$force_deps" = "xyes" ; then
 			AC_MSG_ERROR([
 GNU Libidn development headers not found.
@@ -898,11 +904,14 @@ fi
 	AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
 fi
 
-if test "x$enable_avahi" = "xyes" -a "x$force_deps" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
-	AC_MSG_ERROR([
+if test "x$enable_avahi" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
+	enable_avahi="no"
+	if test "x$force_deps" = "xyes"; then
+		AC_MSG_ERROR([
 avahi development headers not found.
 Use --disable-avahi if you do not need avahi (Bonjour) support.
 ])
+	fi
 fi
 AC_SUBST(AVAHI_CFLAGS)
 AC_SUBST(AVAHI_LIBS)