[patch] unbundling libgadu and updating build system

gg-transport-2.2.2-libgadu.patch (text/plain), 3.05 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-01-14 04:42:37 UTC

--- jggtrans-2.2.2.orig/configure.ac	2006-06-02 19:39:53.000000000 +0000
+++ jggtrans-2.2.2/configure.ac	2010-01-14 04:28:46.865539566 +0000
@@ -15,11 +15,11 @@
 
 CFLAGS="$CFLAGS -Wall"
 
-AM_PATH_GLIB_2_0([2.0.0],[],AC_MSG_ERROR("You need glib >= 2.0.0 to compile this."))
-PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0])
+PKG_PROG_PKG_CONFIG
 
-AC_SUBST(JK_LIBIDN_LIBS)
-AC_SUBST(JK_LIBIDN_CFLAGS)
+PKG_CHECK_MODULES([GLIB], [glib-2.0 > 2.0.0])
+PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0])
+PKG_CHECK_MODULES([GADU], [libgadu > 1.8.0])
 
 AC_ARG_ENABLE([debug],AC_HELP_STRING([--disable-debug],[Disable debugging code]))
 
@@ -58,7 +58,7 @@
 AC_CHECK_FUNCS([select],[],AC_MSG_ERROR("Some functions needed are missing"))
 AC_CHECK_FUNCS([memset strchr],[],AC_MSG_ERROR("Some functions needed are missing"))
 
-AC_CONFIG_SUBDIRS([libxode libgadu])
+AC_CONFIG_SUBDIRS([libxode])
 
 MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"
 XGETTEXT="${XGETTEXT} --keyword=L_"
--- jggtrans-2.2.2.orig/libxode/configure.ac	2004-11-11 21:29:02.000000000 +0000
+++ jggtrans-2.2.2/libxode/configure.ac	2010-01-14 04:15:09.043539666 +0000
@@ -12,7 +12,7 @@
 AC_STDC_HEADERS
 AC_C_BIGENDIAN
 
-AM_PATH_EXPAT([1.95.1],[],[AC_MSG_ERROR([Expat is required, but not found])])
+AC_SEARCH_LIBS([XML_ParserFree],[expat],,AC_MSG_ERROR([Expat not found!!!]),)
 AC_CHECK_FUNC(snprintf,AC_DEFINE(HAVE_SNPRINTF,1,[Define if snprintf function is available]))
 
 AC_CHECK_LIB(nsl, gethostent)
--- jggtrans-2.2.2.orig/Makefile.am	2006-06-02 15:20:19.000000000 +0000
+++ jggtrans-2.2.2/Makefile.am	2010-01-14 04:16:27.262539311 +0000
@@ -1,5 +1,5 @@
 
-SUBDIRS = libxode libgadu src po
+SUBDIRS = libxode src po
 
 .PHONY: cosmetics ChangeLog
 
--- jggtrans-2.2.2.orig/libxode/Makefile.am	2005-07-22 16:19:02.000000000 +0000
+++ jggtrans-2.2.2/libxode/Makefile.am	2010-01-14 04:12:01.638539605 +0000
@@ -1,3 +1,3 @@
 noinst_SCRIPTS = libxode-config
-EXTRA_DIST = libxode-config.in m4/expat.m4
+EXTRA_DIST = libxode-config.in 
 SUBDIRS = include src
--- jggtrans-2.2.2.orig/src/Makefile.am	2006-06-02 19:01:09.000000000 +0000
+++ jggtrans-2.2.2/src/Makefile.am	2010-01-14 04:27:47.853539545 +0000
@@ -56,13 +56,15 @@
 	enc_win2uni.h \
 	encoding.c \
 	encoding.h 
-encodingtest_CFLAGS=-DENCODINGTEST
+encodingtest_CPPFLAGS=-DENCODINGTEST
 encodingtest_LDADD=$(GLIB_LIBS)
+encodingtest_CFLAGS=$(GLIB_CFLAGS)
 
-INCLUDES=$(GLIB_CFLAGS) $(LIBGADU_INCLUDES) -I../libgadu/lib $(JK_LIBIDN_CFLAGS) -I$(top_srcdir)/libxode/include
+INCLUDES=-I$(top_srcdir)/libxode/include
 
-jggtrans_CFLAGS=-DVERSION="\"$(VERSION)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALEDIR="\"$(localedir)\""
-jggtrans_LDADD=$(INTLLIBS) $(GLIB_LIBS) ../libgadu/lib/libgadu.la $(LIBGADU_LIBS) $(LIBGADU_LDFLAGS) $(JK_LIBIDN_LIBS) $(top_builddir)/libxode/src/libxode.la
+jggtrans_CPPFLAGS=-DVERSION="\"$(VERSION)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALEDIR="\"$(localedir)\""
+jggtrans_CFLAGS = $(GLIB_CFLAGS) $(GADU_CFLAGS) $(JK_LIBIDN_CFLAGS)
+jggtrans_LDADD= $(top_builddir)/libxode/src/libxode.la $(INTLLIBS) $(GLIB_LIBS) $(GADU_LIBS) $(JK_LIBIDN_LIBS)
 
 tags: 
 	ctags -R . ../libxode/