API tools faq
paste
Guest User

php multiple SAPI

a guest
Nov 11th, 2010
150
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.49 KB | None | 0 0
raw download clone embed print report
  1. Index: sapi/cgi/config.m4
  2. ===================================================================
  3. --- sapi/cgi/config.m4  (révision 0)
  4. +++ sapi/cgi/config.m4  (révision 0)
  5. @@ -0,0 +1,74 @@
  6. +dnl
  7. +dnl $Id$
  8. +dnl
  9. +
  10. +PHP_ARG_ENABLE(cgi,,
  11. +[  --enable-cgi           Enable building CGI version of PHP], no, no)
  12. +
  13. +dnl
  14. +dnl CGI setup
  15. +dnl
  16. +AC_MSG_CHECKING(whether to build CGI binary)
  17. +if test "$PHP_CGI" != "no"; then
  18. +  AC_MSG_RESULT(yes)
  19. +
  20. +  AC_MSG_CHECKING([for socklen_t in sys/socket.h])
  21. +  AC_EGREP_HEADER([socklen_t], [sys/socket.h],
  22. +    [AC_MSG_RESULT([yes])
  23. +     AC_DEFINE([HAVE_SOCKLEN_T], [1],
  24. +      [Define if the socklen_t typedef is in sys/socket.h])],
  25. +    AC_MSG_RESULT([no]))
  26. +
  27. +  AC_MSG_CHECKING([for sun_len in sys/un.h])
  28. +  AC_EGREP_HEADER([sun_len], [sys/un.h],
  29. +    [AC_MSG_RESULT([yes])
  30. +     AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1],
  31. +      [Define if sockaddr_un in sys/un.h contains a sun_len component])],
  32. +    AC_MSG_RESULT([no]))
  33. +
  34. +  AC_MSG_CHECKING([whether cross-process locking is required by accept()])
  35. +  case "`uname -sr`" in
  36. +    IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)  
  37. +      AC_MSG_RESULT([yes])
  38. +      AC_DEFINE([USE_LOCKING], [1],
  39. +        [Define if cross-process locking is required by accept()])
  40. +    ;;
  41. +    *)
  42. +      AC_MSG_RESULT([no])
  43. +    ;;
  44. +  esac
  45. +
  46. +  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
  47. +
  48. +  dnl Set filename
  49. +  case $host_alias in
  50. +    *cygwin* )
  51. +      SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
  52. +      ;;
  53. +    * )
  54. +      SAPI_CGI_PATH=sapi/cgi/php-cgi
  55. +      ;;
  56. +  esac
  57. +  PHP_SUBST(SAPI_CGI_PATH)
  58. +
  59. +  dnl Set install target and select SAPI
  60. +  INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
  61. +  PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
  62. +
  63. +  case $host_alias in
  64. +    *aix*)
  65. +      BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  66. +      ;;
  67. +    *darwin*)
  68. +      BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  69. +    ;;
  70. +    *)
  71. +      BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  72. +    ;;
  73. +  esac
  74. +
  75. +  PHP_SUBST(BUILD_CGI)
  76. +
  77. +else
  78. +  AC_MSG_RESULT(no)
  79. +fi
  80. Index: sapi/cgi/config9.m4
  81. ===================================================================
  82. --- sapi/cgi/config9.m4 (révision 305275)
  83. +++ sapi/cgi/config9.m4 (copie de travail)
  84. @@ -1,80 +0,0 @@
  85. -dnl
  86. -dnl $Id$
  87. -dnl
  88. -
  89. -PHP_ARG_ENABLE(cgi,,
  90. -[  --disable-cgi           Disable building CGI version of PHP], yes, no)
  91. -
  92. -dnl
  93. -dnl CGI setup
  94. -dnl
  95. -if test "$PHP_SAPI" = "default"; then
  96. -  AC_MSG_CHECKING(whether to build CGI binary)
  97. -  if test "$PHP_CGI" != "no"; then
  98. -    AC_MSG_RESULT(yes)
  99. -
  100. -    AC_MSG_CHECKING([for socklen_t in sys/socket.h])
  101. -    AC_EGREP_HEADER([socklen_t], [sys/socket.h],
  102. -      [AC_MSG_RESULT([yes])
  103. -       AC_DEFINE([HAVE_SOCKLEN_T], [1],
  104. -        [Define if the socklen_t typedef is in sys/socket.h])],
  105. -      AC_MSG_RESULT([no]))
  106. -
  107. -    AC_MSG_CHECKING([for sun_len in sys/un.h])
  108. -    AC_EGREP_HEADER([sun_len], [sys/un.h],
  109. -      [AC_MSG_RESULT([yes])
  110. -       AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1],
  111. -        [Define if sockaddr_un in sys/un.h contains a sun_len component])],
  112. -      AC_MSG_RESULT([no]))
  113. -
  114. -    AC_MSG_CHECKING([whether cross-process locking is required by accept()])
  115. -    case "`uname -sr`" in
  116. -      IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
  117. -        AC_MSG_RESULT([yes])
  118. -        AC_DEFINE([USE_LOCKING], [1],
  119. -          [Define if cross-process locking is required by accept()])
  120. -      ;;
  121. -      *)
  122. -        AC_MSG_RESULT([no])
  123. -      ;;
  124. -    esac
  125. -
  126. -    PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
  127. -
  128. -    dnl Set filename
  129. -    case $host_alias in
  130. -      *cygwin* )
  131. -        SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
  132. -        ;;
  133. -      * )
  134. -        SAPI_CGI_PATH=sapi/cgi/php-cgi
  135. -        ;;
  136. -    esac
  137. -    PHP_SUBST(SAPI_CGI_PATH)
  138. -
  139. -    dnl Set install target and select SAPI
  140. -    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
  141. -    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
  142. -
  143. -    case $host_alias in
  144. -      *aix*)
  145. -        BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  146. -        ;;
  147. -      *darwin*)
  148. -        BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  149. -      ;;
  150. -      *)
  151. -        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
  152. -      ;;
  153. -    esac
  154. -
  155. -    PHP_SUBST(BUILD_CGI)
  156. -
  157. -  elif test "$PHP_CLI" != "no"; then
  158. -    AC_MSG_RESULT(no)
  159. -    OVERALL_TARGET=
  160. -    PHP_SAPI=cli  
  161. -  else
  162. -    AC_MSG_ERROR([No SAPIs selected.])  
  163. -  fi
  164. -fi
  165. Index: configure.in
  166. ===================================================================
  167. --- configure.in    (révision 305275)
  168. +++ configure.in    (copie de travail)
  169. @@ -320,6 +320,15 @@
  170.  
  171.  esyscmd(./build/config-stubs sapi)
  172.  
  173. +if test "x$PHP_SAPI" = "xdefault"; then
  174. +  if test "x$PHP_CLI" != "xno"; then
  175. +    OVERALL_TARGET=
  176. +    PHP_SAPI=cli
  177. +  else
  178. +    AC_MSG_ERROR([No SAPIs selected.])
  179. +  fi
  180. +fi
  181. +
  182.  dnl Show which main SAPI was selected
  183.  AC_MSG_CHECKING([for chosen SAPI module])
  184.  AC_MSG_RESULT([$PHP_SAPI])
  185. Index: acinclude.m4
  186. ===================================================================
  187. --- acinclude.m4    (révision 305275)
  188. +++ acinclude.m4    (copie de travail)
  189. @@ -889,7 +889,11 @@
  190.  dnl objects.
  191.  dnl
  192.  AC_DEFUN([PHP_SELECT_SAPI],[
  193. -  PHP_SAPI=$1
  194. +  if test "x$PHP_SAPI" = "xdefault"; then
  195. +    PHP_SAPI=$1
  196. +  else
  197. +    AC_MSG_ERROR([You can't select the '$1' SAPI as '$PHP_SAPI' has already been selected])
  198. +  fi
  199.    
  200.    case "$2" in
  201.    static[)] PHP_BUILD_STATIC;;
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!