Mercurial > pidgin3 / changeset

--- a/configure.ac	Wed Sep 20 20:32:43 2006 +0000
+++ b/configure.ac	Thu Sep 21 03:07:04 2006 +0000
@@ -652,7 +652,7 @@
 	CPPFLAGS="$CPPFLAGS_save"
 fi
 
-AM_CONDITIONAL(USE_INTERNAL_LIBGG, test "x$gadu_libs" != "xyes")
+AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
 
 AC_SUBST(GADU_LIBS)
 AC_SUBST(GADU_CFLAGS)

--- a/gtk/Makefile.am	Wed Sep 20 20:32:43 2006 +0000
+++ b/gtk/Makefile.am	Thu Sep 21 03:07:04 2006 +0000
@@ -165,6 +165,10 @@
 	$(GTK_LIBS) \
 	$(top_builddir)/libgaim/libgaim.la
 
+if USE_INTERNAL_LIBGADU
+INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+endif
+
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
@@ -179,5 +183,6 @@
 	$(DBUS_CFLAGS) \
 	$(GTKSPELL_CFLAGS) \
 	$(STARTUP_NOTIFICATION_CFLAGS) \
-	$(LIBXML_CFLAGS)
+	$(LIBXML_CFLAGS) \
+	$(INTGG_CFLAGS)
 endif  # ENABLE_GTK

--- a/gtk/gtkdialogs.c	Wed Sep 20 20:32:43 2006 +0000
+++ b/gtk/gtkdialogs.c	Thu Sep 21 03:07:04 2006 +0000
@@ -497,15 +497,15 @@
 #endif
 #endif
 
-#ifdef HAVE_LIBGADU
-#ifdef _WIN32
+#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
 	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
 #else
+#ifdef HAVE_LIBGADU
 	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
-#endif
 #else
 	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
 #endif
+#endif
 
 #ifdef USE_GTKSPELL
 	g_string_append(str, "    <b>GtkSpell:</b> Enabled<br/>");

--- a/libgaim/protocols/gg/Makefile.am	Wed Sep 20 20:32:43 2006 +0000
+++ b/libgaim/protocols/gg/Makefile.am	Thu Sep 21 03:07:04 2006 +0000
@@ -27,7 +27,7 @@
 	gg.h \
 	gg.c
 
-if USE_INTERNAL_LIBGG
+if USE_INTERNAL_LIBGADU
 GGSOURCES += \
 	lib/common.c \
 	lib/compat.h \