diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-11 23:20:37 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-11 23:20:37 +0000 |
| commit | eb923bf6fc9cf71aaf45641784aeb3d23254bf45 (patch) | |
| tree | 8348f41d3874c54c18f8d5baf2007c76bcca45a1 /sapi/milter | |
| parent | 4ef905ae59202730d1d8a37d4babec76f98b6664 (diff) | |
| download | php-git-eb923bf6fc9cf71aaf45641784aeb3d23254bf45.tar.gz | |
MFH: - Changed AC_ARG_* options to PHP_ARG_* options.
MFH: - Some cleanups here and there
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH: options)
# Note to Marcus: ext/dba/config.m4 needs to be "converted" to use
# the PHP_ARG_* options. I did't touch it needs quite a lot of work to keep
# it's current behaviour regarding "enabled-by-default" parts of it.
#
# Hint: By using the PHP_ARG_* options you have the "default" option.. ;)
Diffstat (limited to 'sapi/milter')
| -rw-r--r-- | sapi/milter/config.m4 | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4 index 36c212b4c5..e314551857 100644 --- a/sapi/milter/config.m4 +++ b/sapi/milter/config.m4 @@ -2,15 +2,9 @@ dnl dnl $Id$ dnl -AC_MSG_CHECKING(for Milter support) -AC_ARG_WITH(milter, -[ --with-milter[=DIR] Build PHP as Milter application],[ - PHP_MILTER=$withval -], [ - PHP_MILTER=no -]) +PHP_ARG_WITH(milter, for Milter support, +[ --with-milter[=DIR] Build PHP as Milter application], no, no) -RESULT=no if test "$PHP_MILTER" != "no"; then if test "$PHP_MILTER" = "yes"; then if test -f /usr/lib/libmilter.a ; then @@ -19,7 +13,7 @@ if test "$PHP_MILTER" != "no"; then if test -f /usr/lib/libmilter/libmilter.a ; then MILTERPATH=/usr/lib/libmilter else - AC_MSG_ERROR(Unable to find libmilter.a) + AC_MSG_ERROR([Unable to find libmilter.a]) fi fi else @@ -33,8 +27,6 @@ if test "$PHP_MILTER" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,) BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter" - RESULT=yes PHP_SUBST(SAPI_MILTER_PATH) PHP_SUBST(BUILD_MILTER) fi -AC_MSG_RESULT($RESULT) |