# HG changeset patch
# User mikael
# Date 1113652766 0
# Node ID 1fc66b6c08eff2cae7b150ba466dd900046d6f97
# Parent  9b7f0d313e338a7640638cc286102c840527b017
[/trunk] Changeset 87 by mikael

* Check for glib and update Makefiles to use it.


diff -r 9b7f0d313e33 -r 1fc66b6c08ef mcabber/configure.ac
--- a/mcabber/configure.ac	Sat Apr 16 10:14:55 2005 +0000
+++ b/mcabber/configure.ac	Sat Apr 16 11:59:26 2005 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(mcabber, 0.6.0-dev, bmikael@lists.lilotux.net)
+AC_INIT([mcabber],[0.6.0-dev],[bmikael@lists.lilotux.net])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER(config.h)
@@ -43,6 +43,9 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm bzero gethostbyname gethostname inet_ntoa isascii memmove memset modf select setlocale socket strcasecmp strchr strdup strncasecmp strrchr strstr])
 
+# Check for glib
+AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR([glib is required]),[g_list_append])
+
 AC_ARG_WITH(ssl, [  --with-ssl              enable SSL secured connections using either OpenSSL
 			  or GnuTLS],
 	[with_ssl=$withval])
diff -r 9b7f0d313e33 -r 1fc66b6c08ef mcabber/macros/glib-2.0.m4
--- a/mcabber/macros/glib-2.0.m4	Sat Apr 16 10:14:55 2005 +0000
+++ b/mcabber/macros/glib-2.0.m4	Sat Apr 16 11:59:26 2005 +0000
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
 dnl gthread is specified in MODULES, pass to pkg-config
 dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
+AC_DEFUN([AM_PATH_GLIB_2_0],
 [dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
diff -r 9b7f0d313e33 -r 1fc66b6c08ef mcabber/src/Makefile.am
--- a/mcabber/src/Makefile.am	Sat Apr 16 10:14:55 2005 +0000
+++ b/mcabber/src/Makefile.am	Sat Apr 16 11:59:26 2005 +0000
@@ -1,12 +1,14 @@
 bin_PROGRAMS = mcabber
 mcabber_SOURCES = main.c jabglue.c jabglue.h commands.c commands.h \
-		  buddies.c buddies.h screen.c screen.h \
+		  roster.c roster.h hbuf.c hbuf.h screen.c screen.h \
+		  buddies.c buddies.h \
 		  parsecfg.c parsecfg.h utf8.c utf8.h \
 		  utils.c utils.h lang.c lang.h list.h harddefines.h
 
-LDADD = -lncurses -lpanel -lssl \
+LDADD = -lglib-2.0 -lncurses -lpanel -lssl \
 	../libjabber/liblibjabber.a ../connwrap/libconnwrap.a
 
+INCLUDES = $(GLIB_CFLAGS)
+
 #SUBDIRS =
-#INCLUDES =