# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1158752546 0
# Node ID d44c87d17b196ed6012d89aba443c46720c04445
# Parent  26e7d03d40c54cfb0a694acc0625fe092bbac287
[gaim-migrate @ 17327]
Fall back to using internal libgadu if an external one is not found

committer: Tailor Script <tailor@pidgin.im>

diff -r 26e7d03d40c5 -r d44c87d17b19 configure.ac
--- a/configure.ac	Wed Sep 20 09:13:17 2006 +0000
+++ b/configure.ac	Wed Sep 20 11:42:26 2006 +0000
@@ -652,6 +652,8 @@
 	CPPFLAGS="$CPPFLAGS_save"
 fi
 
+AM_CONDITIONAL(USE_INTERNAL_LIBGG, test "x$gadu_libs" != "xyes")
+
 AC_SUBST(GADU_LIBS)
 AC_SUBST(GADU_CFLAGS)
 
@@ -676,9 +678,6 @@
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'`
 fi
-if test "x$gadu_libs" != "xyes"; then
-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/gg//'`
-fi
 AC_SUBST(STATIC_PRPLS)
 STATIC_LINK_LIBS=
 extern_init=
@@ -741,9 +740,6 @@
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'`
 fi
-if test "x$gadu_libs" != "xyes"; then
-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/gg//'`
-fi
 AC_SUBST(DYNAMIC_PRPLS)
 for i in $DYNAMIC_PRPLS ; do
 	case $i in
diff -r 26e7d03d40c5 -r d44c87d17b19 libgaim/protocols/gg/Makefile.am
--- a/libgaim/protocols/gg/Makefile.am	Wed Sep 20 09:13:17 2006 +0000
+++ b/libgaim/protocols/gg/Makefile.am	Wed Sep 20 11:42:26 2006 +0000
@@ -27,6 +27,23 @@
 	gg.h \
 	gg.c
 
+if USE_INTERNAL_LIBGG
+GGSOURCES += \
+	lib/common.c \
+	lib/compat.h \
+	lib/dcc.c \
+	lib/events.c \
+	lib/http.c \
+	lib/libgadu.c \
+	lib/libgadu-config.h \
+	lib/libgadu.h \
+	lib/obsolete.c \
+	lib/pubdir50.c \
+	lib/pubdir.c
+
+INTGG_CFLAGS = -I$(top_srcdir)/libgaim/protocols/gg/lib
+endif
+
 AM_CFLAGS = $(st)
 
 libgg_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
@@ -54,6 +71,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libgaim \
+	$(INTGG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)