X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-courierauth;a=blobdiff_plain;f=config.m4;h=9df2c6db3be6621e03b9f986db936fc6e0a7c88f;hp=682c1a78151a541a0f65b923666521abf32dbc34;hb=7b93aa378de63cbc18767c40874817a74f0fe77b;hpb=e09249514b95b7883fd162554a934ffdcbe98486

diff --git a/config.m4 b/config.m4
index 682c1a7..9df2c6d 100644
--- a/config.m4
+++ b/config.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension courierauth
 
 PHP_ARG_WITH(courierauth, for courierauth support,
-	[  --with-courierauth-config
+	[  --with-courierauth
                           Path to courierauthconfig script])
 PHP_ARG_WITH(courierauth-security-risk, whether to enable passwd security risk,
 	[  --with-courierauth-security-risk
@@ -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])