bbonev Sun Jan 14 08:40:26 2001 EDT
Modified files:
/php4/ext/vpopmail config.m4
Log:
rewritten the whole logic of the script
added VPOPMAIL_BIN_DIR to point to ~vpopmail/bin directory
added checks for ALL files needed by the extension
style fixes to the output
Index: php4/ext/vpopmail/config.m4
diff -u php4/ext/vpopmail/config.m4:1.1 php4/ext/vpopmail/config.m4:1.2
--- php4/ext/vpopmail/config.m4:1.1 Sun Jan 14 00:54:00 2001
+++ php4/ext/vpopmail/config.m4 Sun Jan 14 08:40:25 2001
@@ -1,45 +1,50 @@
-dnl $Id: config.m4,v 1.1 2001/01/14 08:54:00 david Exp $
+dnl $Id: config.m4,v 1.2 2001/01/14 16:40:25 bbonev Exp $
dnl config.m4 for extension vpopmail
-PHP_ARG_WITH(vpopmail, whether to include vpopmail support,
-[ --with-vpopmail[=DIR] Include vpopmail support])
+PHP_ARG_WITH(vpopmail, for 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)
- 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)
+ PHP_SUBST(VPOPMAIL_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(vpopmail, $VPOPMAIL_LIB_DIR, VPOPMAIL_SHARED_LIBADD)
- AC_ADD_INCLUDE($VPOPMAIL_INC_DIR)
+ AC_DEFINE(HAVE_VPOPMAIL,1,[Whether you have vpopmail])
+ AC_DEFINE_UNQUOTED(VPOPMAIL_BIN_DIR,"$VPOPMAIL_BIN_DIR",[vpopmail bin path])
- 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)
+ PHP_EXTENSION(vpopmail, $ext_shared)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
