build system: use consistently pkg-config to check for dependencies

Rather than rely on the old m4 macros for libxml2 and libcurl, which were
also misused, always use PKG_CHECK_MODULES (also assuming a new enough
version that calls AC_SUBST by itself), and fix the Makefile.am to use
_CFLAGS properly as well.

Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/Makefile.am b/Makefile.am
index 7799e4ad22fcd3c13432a59d672f66700747c5d9..7b5953e07384a2e0740e3f77c0d0d399ad0f0c8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,11 @@ bin_SCRIPTS = \
 bti_SOURCES = \
        bti.c
 
 bti_SOURCES = \
        bti.c
 

-bti_CPPFLAGS = \
-       $(LIBCURL_CPPFLAGS) \
-       $(XML_CPPFLAGS) \
-       $(LIBPCRE_CPPFLAGS) \
-       $(LIBOAUTH_CPPFLAGS)
+bti_CFLAGS = \
+       $(LIBCURL_CFLAGS) \
+       $(XML_CFLAGS) \
+       $(LIBPCRE_CFLAGS) \
+       $(LIBOAUTH_CFLAGS)

 
 bti_LDADD = \
        $(LIBCURL_LIBS) \
 
 bti_LDADD = \
        $(LIBCURL_LIBS) \

diff --git a/configure.ac b/configure.ac
index f19ff0e9105f36bb2f6bcec2090d6cbbe969e2bd..a415f3fe4228a275a4ff0d4e2c144e506da2116d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,25 +19,9 @@ AC_CHECK_LIB([nsl], [main])
 PKG_PROG_PKG_CONFIG()
 
 PKG_CHECK_MODULES(LIBOAUTH, oauth)
 PKG_PROG_PKG_CONFIG()
 
 PKG_CHECK_MODULES(LIBOAUTH, oauth)

-AC_SUBST(LIBOAUTH_CFLAGS)
-AC_SUBST(LIBOAUTH_LIBS)
-

 PKG_CHECK_MODULES(LIBPCRE, libpcre)
 PKG_CHECK_MODULES(LIBPCRE, libpcre)

-AC_SUBST(LIBPCRE_CFLAGS)
-AC_SUBST(LIBPCRE_LIBS)
-
-
-# CURL
-LIBCURL_CHECK_CONFIG([yes], [], [have_libcurl="yes"], [have_libcurl="no"])
-if test "${have_libcurl}" != yes; then
-       AC_MSG_ERROR([libcurl library not found, please install it])
-fi
-
-# libxml2
-AM_PATH_XML2([], [have_libxml="yes"], [have_libxml="no"])
-if test "${have_libxml}" != yes; then
-       AC_MSG_ERROR([libxml not found, please install it])
-fi
+PKG_CHECK_MODULES([LIBCURL], [libcurl])
+PKG_CHECK_MODULES([XML], [libxml-2.0])

 
 # explicitly link DSOs
 LIBS="$LIBS -ldl"
 
 # explicitly link DSOs
 LIBS="$LIBS -ldl"