vpopmail's bin dir is unnecessary as the library exports these functions

diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4
index 8d26f5ba4268b728238cbf9daddc837be0f346e0..6c20a46704106bc8957c13ac050be6449a5d2468 100644 (file)
--- a/ext/vpopmail/config.m4
+++ b/ext/vpopmail/config.m4
@@ -1,50 +1,45 @@
 dnl $Id$
 dnl config.m4 for extension vpopmail
 
-PHP_ARG_WITH(vpopmail, for vpopmail support,
-[  --with-vpopmail[=DIR]   Include vpopmail support.])
+PHP_ARG_WITH(vpopmail, whether to include vpopmail support,
+[  --with-vpopmail[=DIR]      Include 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
-               if test -r $i/vpopmail.h; then
-                       VPOPMAIL_INC_DIR=$i
-                       VPOPMAIL_DIR=$i
-               elif test -r $i/include/vpopmail.h; then
-                       VPOPMAIL_INC_DIR=$i/include
-                       VPOPMAIL_DIR=$i
-               fi
-
-               if test -r $i/libvpopmail.a; then
-                       VPOPMAIL_LIB_DIR=$i
-               elif test -r $i/lib/libvpopmail.a; then
-                       VPOPMAIL_LIB_DIR=$i/lib
-               fi
-
-               if test -r $i/vadddomain; then
-                       VPOPMAIL_BIN_DIR=$i
-               elif test -r $i/bin/vadddomain; then
-                       VPOPMAIL_BIN_DIR=$i/bin
-               fi
-       done
-
-       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)
-               fi
-       done
-
-       AC_MSG_RESULT($VPOPMAIL_DIR)
-
-       AC_ADD_INCLUDE($VPOPMAIL_INC_DIR)
-
-       PHP_SUBST(VPOPMAIL_SHARED_LIBADD)
-       AC_ADD_LIBRARY_WITH_PATH(vpopmail, $VPOPMAIL_LIB_DIR, VPOPMAIL_SHARED_LIBADD)
-
-       AC_DEFINE(HAVE_VPOPMAIL,1,[Whether you have vpopmail])
-       AC_DEFINE_UNQUOTED(VPOPMAIL_BIN_DIR,"$VPOPMAIL_BIN_DIR",[vpopmail bin path])
-
-       PHP_EXTENSION(vpopmail, $ext_shared)
+
+  for i in /home/vpopmail /home/popmail /var/qmail/vpopmail /var/qmail/popmail $PHP_VPOPMAIL; do
+    if test -r $i/vpopmail.h; then
+      VPOPMAIL_INC_DIR=$i
+    elif test -r $i/include/vpopmail.h; then
+      VPOPMAIL_INC_DIR=$i/include
+    fi
+
+    if test -r $i/libvpopmail.a; then
+      VPOPMAIL_LIB_DIR=$i
+    elif test -r $i/lib/libvpopmail.a; then
+      VPOPMAIL_LIB_DIR=$i/lib
+    fi
+  done
+
+  if test -z "$VPOPMAIL_INC_DIR"; then
+    AC_MSG_ERROR(Could not find vpopmail.h. Please make sure you have
+                 vpopmail installed. Use
+                 ./configure --with-vpopmail=<vpopmail-home-dir> if necessary)
+  fi
+
+  if test -z "$VPOPMAIL_LIB_DIR"; then
+    AC_MSG_ERROR(Could not find libvpopmail.a. Please make sure you have
+                 vpopmail installed. Use
+                 ./configure --with-vpopmail=<vpopmail-home-dir> if necessary)
+  fi
+
+  AC_MSG_RESULT(found in $VPOPMAIL_LIB_DIR)
+
+  AC_ADD_INCLUDE($VPOPMAIL_INC_DIR)
+
+  PHP_SUBST(VPOPMAIL_SHARED_LIBADD)
+  AC_ADD_LIBRARY_WITH_PATH(vpopmail, $VPOPMAIL_LIB_DIR, VPOPMAIL_SHARED_LIBADD)
+
+  AC_DEFINE(HAVE_VPOPMAIL, 1, [ ])
+
+  PHP_EXTENSION(vpopmail, $ext_shared)
 fi