summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2002-09-29 16:22:49 +0000
committerSascha Schumann <sas@php.net>2002-09-29 16:22:49 +0000
commite6e54605b7c4153be53a4ee62429fcc4eb2d8970 (patch)
treed805a9b1167884923e1754fd8e5557cdf4fc77fc /acinclude.m4
parent2af630f87db2e08a0837d062bcad2cd403bed4e7 (diff)
downloadphp-git-e6e54605b7c4153be53a4ee62429fcc4eb2d8970.tar.gz
Follow Yasuo's suggestion and build sapi program's under the sapi-specific
directory. Move sapi-specific makefile fragments to their respective directory. Create an embed sapi module which resides in its own dir now.
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3ebad7a5bb..34cad8a028 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -814,7 +814,7 @@ dnl
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN(PHP_BUILD_PROGRAM,[
- OVERALL_TARGET=php
+ OVERALL_TARGET=[]ifelse($1,,php,$1)
php_c_pre='$(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=' && echo > $[@]'
@@ -1179,7 +1179,7 @@ EOF
])
dnl
-dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags]])
+dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
dnl
dnl Selects the SAPI name and type (static, shared, programm)
dnl and optionally also the source-files for the SAPI-specific
@@ -1192,7 +1192,7 @@ AC_DEFUN(PHP_SELECT_SAPI,[
static) PHP_BUILD_STATIC;;
shared) PHP_BUILD_SHARED;;
bundle) PHP_BUILD_BUNDLE;;
- program) PHP_BUILD_PROGRAM;;
+ program) PHP_BUILD_PROGRAM($5);;
esac
ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])