[Gaim-commits] SF.net SVN: gaim: [17327] trunk

[<nos...@us...>]

Revision: 17327
          http://svn.sourceforge.net/gaim/?rev=17327&view=rev
Author:   nosnilmot
Date:     2006-09-20 04:42:26 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Fall back to using internal libgadu if an external one is not found

Modified Paths:
--------------
    trunk/configure.ac
    trunk/libgaim/protocols/gg/Makefile.am

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-09-20 09:13:17 UTC (rev 17326)
+++ trunk/configure.ac	2006-09-20 11:42:26 UTC (rev 17327)
@@ -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

Modified: trunk/libgaim/protocols/gg/Makefile.am
===================================================================
--- trunk/libgaim/protocols/gg/Makefile.am	2006-09-20 09:13:17 UTC (rev 17326)
+++ trunk/libgaim/protocols/gg/Makefile.am	2006-09-20 11:42:26 UTC (rev 17327)
@@ -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)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.