Attachment #216450 for bug #300903





CFLAGS="$CFLAGS -Wall"

PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0])

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]))


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])

MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"
XGETTEXT="${XGETTEXT} --keyword=L_"

Lines 12-18 Link Here

(-)jggtrans-2.2.2.orig/libxode/configure.ac (-1 / +1 lines)
12	AC_STDC_HEADERS	12	AC_STDC_HEADERS
13	AC_C_BIGENDIAN	13	AC_C_BIGENDIAN
14		14
15	AM_PATH_EXPAT([1.95.1],[],[AC_MSG_ERROR([Expat is required, but not found])])	15	AC_SEARCH_LIBS([XML_ParserFree],[expat],,AC_MSG_ERROR([Expat not found!!!]),)
16	AC_CHECK_FUNC(snprintf,AC_DEFINE(HAVE_SNPRINTF,1,[Define if snprintf function is available]))	16	AC_CHECK_FUNC(snprintf,AC_DEFINE(HAVE_SNPRINTF,1,[Define if snprintf function is available]))
17		17
18	AC_CHECK_LIB(nsl, gethostent)	18	AC_CHECK_LIB(nsl, gethostent)

Lines 1-5 Link Here

(-)jggtrans-2.2.2.orig/Makefile.am (-1 / +1 lines)
1		1
2	SUBDIRS = libxode libgadu src po	2	SUBDIRS = libxode src po
3		3
4	.PHONY: cosmetics ChangeLog	4	.PHONY: cosmetics ChangeLog
5		5

Lines 1-3 Link Here

(-)jggtrans-2.2.2.orig/libxode/Makefile.am (-1 / +1 lines)
1	noinst_SCRIPTS = libxode-config	1	noinst_SCRIPTS = libxode-config
2	EXTRA_DIST = libxode-config.in m4/expat.m4	2	EXTRA_DIST = libxode-config.in
3	SUBDIRS = include src	3	SUBDIRS = include src




	enc_win2uni.h \
	encoding.c \
	encoding.h 
encodingtest_CPPFLAGS=-DENCODINGTEST
encodingtest_LDADD=$(GLIB_LIBS)
encodingtest_CFLAGS=$(GLIB_CFLAGS)

INCLUDES=-I$(top_srcdir)/libxode/include

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/

Return to bug 300903

Lines 15-25 Link Here

(-)jggtrans-2.2.2.orig/configure.ac (-5 / +5 lines)
15		15
16	CFLAGS="$CFLAGS -Wall"	16	CFLAGS="$CFLAGS -Wall"
17		17
18	AM_PATH_GLIB_2_0([2.0.0],[],AC_MSG_ERROR("You need glib >= 2.0.0 to compile this."))	18	PKG_PROG_PKG_CONFIG
19	PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0])
20		19
21	AC_SUBST(JK_LIBIDN_LIBS)	20	PKG_CHECK_MODULES([GLIB], [glib-2.0 > 2.0.0])
22	AC_SUBST(JK_LIBIDN_CFLAGS)	21	PKG_CHECK_MODULES([JK_LIBIDN], [libidn >= 0.3.0])
		22	PKG_CHECK_MODULES([GADU], [libgadu > 1.8.0])
23		23
24	AC_ARG_ENABLE([debug],AC_HELP_STRING([--disable-debug],[Disable debugging code]))	24	AC_ARG_ENABLE([debug],AC_HELP_STRING([--disable-debug],[Disable debugging code]))
25		25
Lines 58-64 Link Here
58	AC_CHECK_FUNCS([select],[],AC_MSG_ERROR("Some functions needed are missing"))	58	AC_CHECK_FUNCS([select],[],AC_MSG_ERROR("Some functions needed are missing"))
59	AC_CHECK_FUNCS([memset strchr],[],AC_MSG_ERROR("Some functions needed are missing"))	59	AC_CHECK_FUNCS([memset strchr],[],AC_MSG_ERROR("Some functions needed are missing"))
60		60
61	AC_CONFIG_SUBDIRS([libxode libgadu])	61	AC_CONFIG_SUBDIRS([libxode])
62		62
63	MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"	63	MKINSTALLDIRS="${MKINSTALLDIRS} -m 755"
64	XGETTEXT="${XGETTEXT} --keyword=L_"	64	XGETTEXT="${XGETTEXT} --keyword=L_"

Lines 56-68 Link Here

(-)jggtrans-2.2.2.orig/src/Makefile.am (-4 / +6 lines)
56	enc_win2uni.h \	56	enc_win2uni.h \
57	encoding.c \	57	encoding.c \
58	encoding.h	58	encoding.h
59	encodingtest_CFLAGS=-DENCODINGTEST	59	encodingtest_CPPFLAGS=-DENCODINGTEST
60	encodingtest_LDADD=$(GLIB_LIBS)	60	encodingtest_LDADD=$(GLIB_LIBS)
		61	encodingtest_CFLAGS=$(GLIB_CFLAGS)
61		62
62	INCLUDES=$(GLIB_CFLAGS) $(LIBGADU_INCLUDES) -I../libgadu/lib $(JK_LIBIDN_CFLAGS) -I$(top_srcdir)/libxode/include	63	INCLUDES=-I$(top_srcdir)/libxode/include
63		64
64	jggtrans_CFLAGS=-DVERSION="\"$(VERSION)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALEDIR="\"$(localedir)\""	65	jggtrans_CPPFLAGS=-DVERSION="\"$(VERSION)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALEDIR="\"$(localedir)\""
65	jggtrans_LDADD=$(INTLLIBS) $(GLIB_LIBS) ../libgadu/lib/libgadu.la $(LIBGADU_LIBS) $(LIBGADU_LDFLAGS) $(JK_LIBIDN_LIBS) $(top_builddir)/libxode/src/libxode.la	66	jggtrans_CFLAGS = $(GLIB_CFLAGS) $(GADU_CFLAGS) $(JK_LIBIDN_CFLAGS)
		67	jggtrans_LDADD= $(top_builddir)/libxode/src/libxode.la $(INTLLIBS) $(GLIB_LIBS) $(GADU_LIBS) $(JK_LIBIDN_LIBS)
66		68
67	tags:	69	tags:
68	ctags -R . ../libxode/	70	ctags -R . ../libxode/