Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/guifications/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- Makefile.am	15 Jan 2004 02:14:24 -0000	1.6
+++ Makefile.am	22 Feb 2004 02:23:21 -0000
@@ -2,9 +2,9 @@
 	Makefile.mingw \
 	gf_config.h.mingw \
 	guifications-installer.nsi \
-	nsis/translations/header.bmp \
-	nsis/translations/install.ico \
-	nsis/translations/engish.nsh \
+	nsis/header.bmp \
+	nsis/install.ico \
+	nsis/translations/english.nsh \
 	VERSION
 
 SUBDIRS = pixmaps src
Index: configure.ac
===================================================================
RCS file: /var/lib/cvs/guifications/configure.ac,v
retrieving revision 1.15
diff -u -u -r1.15 configure.ac
--- configure.ac	15 Jan 2004 01:58:58 -0000	1.15
+++ configure.ac	22 Feb 2004 02:23:21 -0000
@@ -32,46 +32,6 @@
 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)
 
 if test "x$enable_debug" = "xyes" ; then
@@ -86,6 +46,13 @@
 fi
 AC_SUBST(CFLAGS)
 
+PKG_CHECK_MODULES(GAIM, gaim >= 0.76,
+[
+        AC_DEFINE(HAVE_GAIM, 1, [Define if we've found gaim.])
+])
+                                                                                                                                                          
+AC_SUBST(GAIM_CFLAGS)
+
 #
 # check for gtk and other dependencies
 #
@@ -125,7 +92,6 @@
 echo;
 echo Configuration complete
 echo;
-echo Using Gaim source from.........: $with_gaim
 echo Debugging enabled..............: $enable_debug
 echo;
 echo Type make to compile
Index: src/Makefile.am
===================================================================
RCS file: /var/lib/cvs/guifications/src/Makefile.am,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile.am
--- src/Makefile.am	11 Jan 2004 00:35:45 -0000	1.5
+++ src/Makefile.am	22 Feb 2004 02:23:21 -0000
@@ -34,6 +34,7 @@
 	-DDATADIR=\"$(datadir)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	$(GAIM_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS)