From b30fceb6c9f7dc451fa9e59f26a4b2dd1b2b696c Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 11 Dec 2006 13:08:01 +0000
Subject: [PATCH] - improve checks for ld an cpp flags

git-svn-id: http://svn.php.net/repository/pecl/courierauth/trunk@224828 c90b9560-bf6c-de11-be94-00142212c4b1
---
 config.m4 | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/config.m4 b/config.m4
index 682c1a7..6cdf750 100644
--- a/config.m4
+++ b/config.m4
@@ -23,8 +23,29 @@ if test "$PHP_COURIERAUTH" != "no"; then
 		AC_MSG_RESULT($COURIERAUTHCONFIG)
 	fi
 	
-	PHP_EVAL_LIBLINE("`$COURIERAUTHCONFIG --ldflags` -lcourierauth", COURIERAUTH_SHARED_LIBADD)
-	PHP_EVAL_INCLINE(`$COURIERAUTHCONFIG --cppflags`)
+	AC_MSG_CHECKING(for courierauth ldflags)
+	COURIERAUTH_LIBS="`$COURIERAUTHCONFIG --ldflags`"
+	AC_MSG_RESULT("$COURIERAUTH_LIBS -lcourierauth")
+	if test -z "$COURIERAUTH_LIBS"; then
+		PHP_ADD_LIBRARY(courierauth, COURIERAUTH_SHARED_LIBADD)
+	else
+		PHP_EVAL_LIBLINE("$COURIERAUTH_LIBS -lcourierauth", COURIERAUTH_SHARED_LIBADD)
+	fi
+	
+	AC_MSG_CHECKING(for courierauth includes)
+	COURIERAUTH_INCS="`$COURIERAUTHCONFIG --cppflags`"
+	if test -z "$COURIERAUTH_INCS"; then
+		for i in /usr/local/include /usr/include; do
+			if test -f $i/courierauth.h; then
+				COURIERAUTH_INCS="-I$i"
+				PHP_ADD_INCLUDE($i)
+				break
+			fi
+		done
+	else
+		PHP_EVAL_INCLINE("$COURIERAUTH_INCS")
+	fi
+	AC_MSG_RESULT("$COURIERAUTH_INCS")
 	
 	if test "$PHP_COURIERAUTH_SECURITY_RISK" = "yes"; then
 		AC_DEFINE(PHP_COURIERAUTH_SECURITY_RISK, 1, [passwd security risk])
-- 
2.30.2