diff options
| author | Jani Taskinen <jani@php.net> | 2010-11-13 23:13:07 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-11-13 23:13:07 +0000 |
| commit | 25aee9cad951b018d615c069373325160847cd4a (patch) | |
| tree | da977ad05055cc4e39fd7592b74c4e8a7b1a034e /sapi/milter | |
| parent | 200dcee22d9790944dbb4f83efef51963a3b35bb (diff) | |
| download | php-git-25aee9cad951b018d615c069373325160847cd4a.tar.gz | |
- Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
# Bug #53271, Bug #52410
Diffstat (limited to 'sapi/milter')
| -rw-r--r-- | sapi/milter/Makefile.frag | 8 | ||||
| -rw-r--r-- | sapi/milter/config.m4 | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sapi/milter/Makefile.frag b/sapi/milter/Makefile.frag index 8dbdf7a8fd..26200a196c 100644 --- a/sapi/milter/Makefile.frag +++ b/sapi/milter/Makefile.frag @@ -1,2 +1,8 @@ -$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +milter: $(SAPI_MILTER_PATH) + +$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_SAPI_OBJS) $(BUILD_MILTER) + +install-milter: $(SAPI_MILTER_PATH) + @$(INSTALL) -m 0755 $(SAPI_MILTER_PATH) $(bindir)/php-milter + diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4 index e314551857..48c7a5d804 100644 --- a/sapi/milter/config.m4 +++ b/sapi/milter/config.m4 @@ -25,8 +25,7 @@ if test "$PHP_MILTER" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag) PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)') 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" + BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" PHP_SUBST(SAPI_MILTER_PATH) PHP_SUBST(BUILD_MILTER) fi |