Index: configure.ac
===================================================================
RCS file: /cvsroot/meanwhile/meanwhile-gaim/configure.ac,v
retrieving revision 1.4
diff -u -p -r1.4 configure.ac
--- configure.ac	17 Jun 2004 19:38:19 -0000	1.4
+++ configure.ac	24 Jun 2004 18:41:48 -0000
@@ -12,22 +12,6 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 
-dnl use the --with-gaim-source option to enable compilation of the gaim plugin
-AC_ARG_WITH(gaim-source, [  --with-gaim-source=DIR
-			  Compile the Gaim plugin against Gaim sources in DIR ], [ac_gaim_source="$withval"],[ac_gaim_source="no"])
-GAIM_INCLUDES=""
-AM_CONDITIONAL(GAIM_PLUGIN, test "$ac_gaim_source" != "no")
-if test "$ac_gaim_source" != "no"; then
-   GAIM_INCLUDES="-I$ac_gaim_source"
-
-   CPPFLAGS_save="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $GAIM_INCLUDES"
-   AC_CHECK_HEADERS(prpl.h blist.h)
-   CPPFLAGS="$CPPFLAGS_save"
-   AC_SUBST(GAIM_INCLUDES)
-fi
-
-
 AC_C_CONST
 AC_STRUCT_TM
 
@@ -39,6 +23,17 @@ fi
 CFLAGS="$CFLAGS -Wall -Werror"
 AC_SUBST(CFLAGS)
 
+
+dnl Check for Gaim
+PKG_CHECK_MODULES(GAIM, gaim,
+[
+	AC_DEFINE(HAVE_GAIM, 1, [Define if we've found gaim.])
+])
+
+AC_SUBST(GAIM_CFLAGS)
+
+
+
 AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
 *** GLib 2.0 is required.]))
 
Index: meanwhile-gaim.spec.in
===================================================================
RCS file: /cvsroot/meanwhile/meanwhile-gaim/meanwhile-gaim.spec.in,v
retrieving revision 1.2
diff -u -p -r1.2 meanwhile-gaim.spec.in
--- meanwhile-gaim.spec.in	22 Jun 2004 04:38:47 -0000	1.2
+++ meanwhile-gaim.spec.in	24 Jun 2004 18:41:48 -0000
@@ -8,6 +8,7 @@ Group: Applications/Internet
 URL: http://meanwhile.sf.net/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: pkgconfig, libtool, glib2-devel, gaim-devel
 Requires: gaim >= 1:0.79, gaim < 1:0.80, meanwhile >= 0.3, meanwhile < 0.4
 
 
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/meanwhile/meanwhile-gaim/src/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- src/Makefile.am	16 Jun 2004 20:24:26 -0000	1.3
+++ src/Makefile.am	24 Jun 2004 18:41:48 -0000
@@ -13,5 +13,5 @@ libmwgaim_la_LDFLAGS = -module -avoid-ve
 
 libmwgaim_la_LIBADD = $(MEANWHILE_LIBS)
 
-INCLUDES = $(GLIB_CFLAGS) $(GAIM_INCLUDES) $(MEANWHILE_INCLUDES)
+INCLUDES = $(GLIB_CFLAGS) $(GAIM_CFLAGS) $(MEANWHILE_INCLUDES)