From 48bc4be818e77c8c7f89f33c7e74269530ef14b4 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 4 Sep 2007 10:31:38 +0200 Subject: [PATCH] build system: Check for libnetlink.h in more than one directory. And some minor cleanups.. --- configure.in | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/configure.in b/configure.in index f291956f..252d16ff 100644 --- a/configure.in +++ b/configure.in @@ -789,7 +789,7 @@ then if test $curl_config_status -ne 0 then - with_libcurl="no" + with_libcurl="no ($with_curl_config failed)" else SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $with_curl_cflags" @@ -806,15 +806,10 @@ then if test $curl_config_status -ne 0 then - with_libcurl="no" + with_libcurl="no ($with_curl_config failed)" else AC_CHECK_LIB(curl, curl_easy_init, - [ - # We need to do this to have `HAVE_LIBCURL' defined but - # `-lcurl' NOT added to the default LDFLAGS. - AC_DEFINE(HAVE_LIBCURL, 1, - [Define to 1 if you have the curl library.]) - ], + [with_libcurl="yes"], [with_libcurl="no (symbol 'curl_easy_init' not found)"], [$with_curl_libs]) fi @@ -986,13 +981,8 @@ then with_libmysql="no" else AC_CHECK_LIB(mysqlclient, mysql_init, - [ - # We need to do this to have `HAVE_LIBMYSQLCLIENT' defined - # but `-lmysqlclient' NOT added to the default LDFLAGS. - AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1, - [Define to 1 if you have the mysqlclient library.]) - ], - [with_libmysql="no (libmysql not found)"], + [with_libmysql="yes"], + [with_libmysql="no (symbol 'mysql_init' not found)"], [$with_mysql_libs]) fi fi @@ -1435,7 +1425,13 @@ then SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $with_libnetlink_cflags" - AC_CHECK_HEADERS(iproute/libnetlink.h, [], [with_libnetlink="no (iproute/libnetlink.h not found)"], + with_libnetlink="no (libnetlink.h not found)" + + AC_CHECK_HEADERS(libnetlink.h iproute/libnetlink.h linux/libnetlink.h, + [ + with_libnetlink="yes" + break + ], [], [#include #include #include -- 2.30.2