1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- sapi/fpm/config.m4.orig 2010-06-16 10:58:42.000000000 +0200
+++ sapi/fpm/config.m4 2010-07-27 13:26:02.000000000 +0200
@@ -562,10 +562,12 @@
PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
- SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
- PHP_SUBST(SAPI_EXTRA_LIBS)
-
- INSTALL_IT=":"
+ FPM_EXTRA_LIBS="$LIBEVENT_LIBS"
+ PHP_SUBST(FPM_EXTRA_LIBS)
+
+ if test "$PHP_SAPI" = "default"; then
+ PHP_SAPI="fpm"
+ fi
PHP_FPM_FILES="fpm/fastcgi.c \
fpm/fpm.c \
fpm/fpm_children.c \
@@ -590,7 +592,8 @@
fpm/zlog.c \
"
- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
+ PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm)
+ PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
case $host_alias in
*aix*)
@@ -600,11 +603,19 @@
BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
esac
+ PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
+ PHP_INSTALL_FPM_TARGET="install-fpm"
PHP_SUBST(BUILD_FPM)
+ PHP_SUBST(PHP_FPM_OBJS)
+ PHP_SUBST(PHP_FPM_TARGET)
+ PHP_SUBST(PHP_INSTALL_FPM_TARGET)
+ if test "$PHP_SAPI" = "fpm" ; then
+ PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
+ fi
else
AC_MSG_RESULT(no)
fi
|
