Index: configure.ac
===================================================================
RCS file: /var/lib/cvs/guifications/configure.ac,v
retrieving revision 1.23
diff -u -p -r1.23 configure.ac
--- configure.ac	21 Jun 2004 07:52:00 -0000	1.23
+++ configure.ac	24 Jun 2004 13:20:19 -0000
@@ -31,44 +31,6 @@ CFLAGS_save="$CFLAGS"
 AC_PROG_CC
 CFLAGS="$CFLAGS_save"
 
-#
-# Utilities
-#
-
-check_for_header() {
-	file="$1"
-	bases="$2"
-	variations=". $3"
-	
-	result=
-	for dir in $bases; do
-	if test -z "$result"; then
-		for variant in $variations; do
-		if test -z "$result" -a -f "$dir/$variant/$file"; then
-			result="$dir/$variant"
-		fi
-		done
-	fi
-	done
-	
-	if test -z "$result"; then
-	AC_MSG_RESULT([not found!])
-	AC_MSG_ERROR([*** Can not continue, note this must be an absolute path])
-	fi
-}
-
-#
-# Find gaim
-#
-
-AC_ARG_WITH(gaim, AC_HELP_STRING([--with-gaim=PATH], [absolute path to gaim source code]))
-	
-AC_MSG_CHECKING([for gaim source code])
-gaim_dirs="$with_gaim .. ../gaim ../.. . $prefix /usr/local/src/gaim /usr/local/gaim /usr"
-check_for_header gaim.h "$gaim_dirs" "src include"
-AC_MSG_RESULT([$result])
-CPPFLAGS="-I$result/../ -I$result -I$result/win32 $CPPFLAGS"
-
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
 AC_ARG_ENABLE(deprecated,    [  --disable-deprecated    compile without deprecated API usage],,enable_deprecated=yes)
 
@@ -87,6 +49,17 @@ fi
 AC_SUBST(CFLAGS)
 
 #
+# Check for Gaim
+#
+
+PKG_CHECK_MODULES(GAIM, gaim,
+[
+	AC_DEFINE(HAVE_GAIM, 1, [Define if we've found gaim.])
+])
+
+AC_SUBST(GAIM_CFLAGS)
+
+#
 # check for gtk and other dependencies
 #
 
@@ -128,8 +101,6 @@ AC_OUTPUT([Makefile
 echo;
 echo Configuration complete
 echo;
-echo Using Gaim source from.........: $with_gaim
-echo;
 echo Debugging enabled..............: $enable_debug
 echo Deprecated API enabled.........: $enable_deprecated
 echo;
Index: src/Makefile.am
===================================================================
RCS file: /var/lib/cvs/guifications/src/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- src/Makefile.am	24 May 2004 19:17:18 -0000	1.8
+++ src/Makefile.am	24 Jun 2004 13:20:19 -0000
@@ -33,4 +33,5 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GAIM_CFLAGS)