From 24cae1ec00520d9fdfdee8a1c8ad21585cb8102d Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 29 Jan 2009 16:47:04 +0100
Subject: [PATCH] build system: Check for the libupsclient library using
 pkg-config *and* a custom script.

References: #24
---
 configure.in | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 8332429e..e99ade7c 100644
--- a/configure.in
+++ b/configure.in
@@ -1771,32 +1771,93 @@ then
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
 
-with_libupsclient="no (pkg-config isn't available)"
+with_libupsclient_config=""
 with_libupsclient_cflags=""
 with_libupsclient_libs=""
-if test "x$PKG_CONFIG" != "x"
-then
-	pkg-config --exists 'libupsclient' 2>/dev/null
-	if test "$?" = "0"
+AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
+[
+	if test "x$withval" = "xno"
 	then
-		with_libupsclient="yes"
+		with_libupsclient="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_libupsclient="use_pkgconfig"
 	else
+		if test -x "$withval"
+		then
+			with_libupsclient_config="$withval"
+			with_libupsclient="use_libupsclient_config"
+		else if test -x "$withval/bin/libupsclient-config"
+		then
+			with_libupsclient_config="$withval/bin/net-snmp-config"
+			with_libupsclient="use_libupsclient_config"
+		else
+			AC_MSG_NOTICE([Not checking for libupsclient: Manually configured])
+			with_libupsclient_cflags="-I$withval/include"
+			with_libupsclient_libs="-L$withval/lib -lupsclient"
+			with_libupsclient="yes"
+		fi; fi
+	fi; fi
+],
+[with_libupsclient="use_pkgconfig"])
+
+# configure using libupsclient-config
+if test "x$with_libupsclient" = "xuse_libupsclient_config"
+then
+	AC_MSG_NOTICE([Checking for libupsclient using $with_libupsclient_config])
+	with_libupsclient_cflags="`$with_libupsclient_config --cflags`"
+	if test $? -ne 0
+	then
+		with_libupsclient="no ($with_libupsclient_config failed)"
+	fi
+	with_libupsclient_libs="`$with_libupsclient_config --libs`"
+	if test $? -ne 0
+	then
+		with_libupsclient="no ($with_libupsclient_config failed)"
+	fi
+fi
+if test "x$with_libupsclient" = "xuse_libupsclient_config"
+then
+	with_libupsclient="yes"
+fi
+
+# configure using pkg-config
+if test "x$with_libupsclient" = "xuse_pkgconfig"
+then
+	if test "x$PKG_CONFIG" = "x"
+	then
+		with_libupsclient="no (Don't have pkg-config)"
+	fi
+fi
+if test "x$with_libupsclient" = "xuse_pkgconfig"
+then
+	AC_MSG_NOTICE([Checking for libupsclient using $PKG_CONFIG])
+	$PKG_CONFIG --exists 'libupsclient' 2>/dev/null
+	if test $? -ne 0
+	then
 		with_libupsclient="no (pkg-config doesn't know library)"
 	fi
 fi
-if test "x$with_libupsclient" = "xyes"
+if test "x$with_libupsclient" = "xuse_pkgconfig"
 then
-	with_libupsclient_cflags="`pkg-config --cflags 'libupsclient'`"
+	with_libupsclient_cflags="`$PKG_CONFIG --cflags 'libupsclient'`"
 	if test $? -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($PKG_CONFIG failed)"
 	fi
-	with_libupsclient_libs="`pkg-config --libs 'libupsclient'`"
+	with_libupsclient_libs="`$PKG_CONFIG --libs 'libupsclient'`"
 	if test $? -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($PKG_CONFIG failed)"
 	fi
 fi
+if test "x$with_libupsclient" = "xuse_pkgconfig"
+then
+	with_libupsclient="yes"
+fi
+
+# with_libupsclient_cflags and with_libupsclient_libs are set up now, let's do
+# the actual checks.
 if test "x$with_libupsclient" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
-- 
2.11.0