From: Markus Fischer <mfischer@php.net>
Date: Sun, 17 Mar 2002 08:33:25 +0000 (+0000)
Subject: - Let configure also detect installation in standard unix paths.
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~1317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=519e6b2208bc825c91b88d92a9b2cbf980f55c8e;p=php

- Let configure also detect installation in standard unix paths.
- Properly format error message.
---

diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4
index dbfe6ecf9e..3e37bc4f61 100644
--- a/ext/vpopmail/config.m4
+++ b/ext/vpopmail/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_WITH(vpopmail, for vpopmail support,
 
 if test "$PHP_VPOPMAIL" != "no"; then
 	AC_MSG_CHECKING(for vpopmail install directory)
-	for i in ~vpopmail /home/vpopmail /home/popmail /var/qmail/vpopmail /var/qmail/popmail $PHP_VPOPMAIL; do
+	for i in /usr/include/vpopmail /usr/include /usr ~vpopmail /home/vpopmail /home/popmail /var/qmail/vpopmail /var/qmail/popmail $PHP_VPOPMAIL; do
 		if test -r $i/vpopmail.h; then
 			VPOPMAIL_INC_DIR=$i
 			VPOPMAIL_DIR=$i
@@ -31,9 +31,8 @@ if test "$PHP_VPOPMAIL" != "no"; then
 
 	for i in "$VPOPMAIL_INC_DIR/vpopmail.h" "$VPOPMAIL_INC_DIR/vpopmail_config.h" "$VPOPMAIL_LIB_DIR/libvpopmail.a" "$VPOPMAIL_BIN_DIR/vadddomain" "$VPOPMAIL_BIN_DIR/vaddaliasdomain" "$VPOPMAIL_BIN_DIR/vdeldomain" ; do
 		if test ! -r "$i"; then
-			AC_MSG_ERROR(Could not find '$i'. Please make sure you have
-				vpopmail installed. Use
-				./configure --with-vpopmail=<vpopmail-home-dir> if necessary)
+			AC_MSG_ERROR(Could not find '$i'. Please make sure you have vpopmail installed. Use
+./configure --with-vpopmail=<vpopmail-home-dir> if necessary)
 		fi
 	done