diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-04 22:00:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-18 12:58:03 +0200 |
| commit | d9fe6affb31e9c45d342fbd944abafa8b074e43b (patch) | |
| tree | 9e6c65e149f58300e666fb6608fa27f9fc7abc0b | |
| parent | bff0023f7bec05bc35b07b2c2d07a3e65a35e8ab (diff) | |
| download | rsyslog-d9fe6affb31e9c45d342fbd944abafa8b074e43b.tar.gz rsyslog-d9fe6affb31e9c45d342fbd944abafa8b074e43b.tar.xz rsyslog-d9fe6affb31e9c45d342fbd944abafa8b074e43b.zip | |
build: Use pkg-config to check for libcurl
curl has shipped that file since 2004.
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index e755dacb..cc5830b6 100644 --- a/configure.ac +++ b/configure.ac @@ -740,27 +740,9 @@ AC_ARG_ENABLE(elasticsearch, [enable_elasticsearch=no] ) if test "x$enable_elasticsearch" = "xyes"; then - AC_CHECK_PROG( - [HAVE_CURL_CONFIG], - [curl-config], - [yes],,, - ) - if test "x${HAVE_CURL_CONFIG}" != "xyes"; then - AC_MSG_FAILURE([curl-config not found in PATH]) - fi - AC_CHECK_LIB( - [curl], - [curl_global_init], - [CURL_CFLAGS="`curl-config --cflags`" - CURL_LIBS="`curl-config --libs`" - ], - [AC_MSG_FAILURE([curl library is missing])], - [`curl-config --libs --cflags`] - ) + PKG_CHECK_MODULES([CURL], [libcurl]) fi AM_CONDITIONAL(ENABLE_ELASTICSEARCH, test x$enable_elasticsearch = xyes) -AC_SUBST(CURL_CFLAGS) -AC_SUBST(CURL_LIBS) # GnuTLS support |