From 1d6a5969e35e312c598a7357830506c52d54c4b8 Mon Sep 17 00:00:00 2001
From: Alan Fitton <ajf@eth0.org.uk>
Date: Thu, 3 Feb 2011 21:17:05 +0000
Subject: make use of libcurl.m4 in configure script, remove some things which
 ubuntu doesn't like.

---
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2b9eab6..0bf9475 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ PKG_CHECK_MODULES([gtk], [gtk+-2.0])
 PKG_CHECK_MODULES([gio], [gio-2.0])
 PKG_CHECK_MODULES([unique], [unique-1.0])
 PKG_CHECK_MODULES([notify], [libnotify])
+LIBCURL_CHECK_CONFIG([yes], [7.0], [], [AC_MSG_ERROR(["libcurl not found"])])
 
 AC_ARG_WITH([libgeoip], AC_HELP_STRING([--without-libgeoip], [disable GeoIP support]))
 have_libgeoip=no
@@ -34,10 +35,6 @@ if test "x$have_geoip" = "xyes"; then
 fi
 AM_CONDITIONAL([HAVE_GEOIP], [test "x$have_geoip" = "xyes"])
 
-AM_GCONF_SOURCE_2
-
-# Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
-AC_FUNC_REALLOC
 
 AC_OUTPUT
-- 
cgit v1.2.3