diff options
| author | Boian Bonev <bbonev@php.net> | 2001-01-14 16:40:26 +0000 |
|---|---|---|
| committer | Boian Bonev <bbonev@php.net> | 2001-01-14 16:40:26 +0000 |
| commit | ef462402f4c4bf007ae0eae8d930b54c437b20e7 (patch) | |
| tree | 2677efca8b95e5855d3c08ea5a2a9a82491edfb0 /ext/vpopmail | |
| parent | 40f3524247f36e6f485f3f1247a222cedab5cbdf (diff) | |
| download | php-git-ef462402f4c4bf007ae0eae8d930b54c437b20e7.tar.gz | |
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
Diffstat (limited to 'ext/vpopmail')
| -rw-r--r-- | ext/vpopmail/config.m4 | 83 |
1 files changed, 44 insertions, 39 deletions
diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4 index 6c20a46704..8d26f5ba42 100644 --- a/ext/vpopmail/config.m4 +++ b/ext/vpopmail/config.m4 @@ -1,45 +1,50 @@ dnl $Id$ 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 - - 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) + 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) fi |