adium.1-4: 96a41ffb: Manually apply a revision that wouldn't ...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 96a41ffb59d945d2fe01cdc5141640f84ce189aa
Ancestor: 48c2553ef4b46482b26f021c97d2569c1b053227
Author: rekkanoryo at pidgin.im
Date: 2010-03-14T03:45:58
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/96a41ffb59d945d2fe01cdc5141640f84ce189aa

Modified files:
        configure.ac

ChangeLog: 

Manually apply a revision that wouldn't pluck cleanly, then pluck more; pluck
authorized by Zac West.

*** Manual-apply rev 60c9671daa2b521f9de4c0980f8798876959570e (qulogic at pidgin.im):
Don't use old versions of libgadu if the user specified a location for the
headers/libraries. GG_DEFAULT_PROTOCOL_VERSION seemed the best bet since
GG_LIBGADU_VERSION is a string, but maybe someone can find something that's
better.

Refs #10542.

*** Plucked rev 87b17dbaabb71cb46ea5e7a233125baa6ab180a8 (qulogic at pidgin.im):
Only accept libgadu >= 1.9.0-rc2 when using pkg-config.

Refs #10542.

*** Plucked rev b3973cf6cdd579f554b216e761247fe47d96045a (rekkanoryo at pidgin.im):
Properly display "no" in the configure output when not using external libgadu.
Refs #10542.


-------------- next part --------------
============================================================
--- configure.ac	c1452bd5623ae7d003fdaf8698870c6ad20b6ec9
+++ configure.ac	771720e0d785515785b0505449c0c85079a3281a
@@ -1021,7 +1021,7 @@ if test "x$gadu_manual_check" = "xno"; t
 	gadu_manual_check="no"
 fi
 if test "x$gadu_manual_check" = "xno"; then
-	PKG_CHECK_MODULES(GADU, libgadu, [
+	PKG_CHECK_MODULES(GADU, [libgadu >= 1.9.0-rc2], [
 		gadu_includes="yes"
 		gadu_libs="yes"
 	], [
@@ -1053,9 +1053,28 @@ if test "x$gadu_libs" = "xyes"; then
 #error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
 #endif
 	], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE([HAVE_LIBGADU], [1],
-			[Define to 1 if you have libgadu.])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+#error "Your libgadu version is too old. libpurple requires 1.9.0-rc2 or higher."
+#endif
+		]])], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE([HAVE_LIBGADU], [1],
+				[Define to 1 if you have libgadu.])
+		], [
+			AC_MSG_RESULT(no)
+			echo
+			echo
+			echo "Your supplied copy of libgadu is too old."
+			echo "Install version 1.9.0-rc2 or newer."
+			echo "Then rerun this ./configure"
+			echo
+			echo "Falling back to using our own copy of libgadu"
+			echo
+			GADU_LIBS=""
+			GADU_CFLAGS=""
+			gadu_libs=no
+		])
 	], [
 		AC_MSG_RESULT(no)
 		echo
@@ -1076,6 +1095,10 @@ AM_CONDITIONAL(USE_INTERNAL_LIBGADU, tes
 
 AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
 
+if test "x$gadu_libs" = "x"; then
+	gadu_libs=no
+fi
+
 AC_SUBST(GADU_LIBS)
 AC_SUBST(GADU_CFLAGS)