cvs commit: ports/lang/php5/files patch-configure.in

[Andrey Chernov]

On Fri, Mar 04, 2011 at 02:25:04AM +0300, Andrey Chernov wrote:
> On Thu, Mar 03, 2011 at 08:20:27AM +0000, Alex Dupre wrote:
> > ale         2011-03-03 08:20:27 UTC
> > 
> >   FreeBSD ports repository
> > 
> >   Modified files:
> >     lang/php5/files      patch-configure.in 
> >   Log:
> >   Don't link with librt, nanosleep is in libc.
> >   
> >   Spotted by:     ache
> >   
> >   Revision  Changes    Path
> >   1.8       +16 -7     ports/lang/php5/files/patch-configure.in
> 
> There is mistake in this patch: now configure do not set HAVE_NANOSLEEP at 
> all.
> 
> It seems the line should be changed to
> PHP_CHECK_FUNC_LIB(nanosleep, c)
> instead of being removed.

To make it even more simple: just add 'nanosleep' to the list of other 
functions after removing this extra check. Fixed patch-configure.in 
attached.

-- 
http://ache.vniz.net/
-------------- next part --------------
--- configure.in.orig	2011-03-04 02:35:37.000000000 +0300
+++ configure.in	2011-03-04 02:37:43.000000000 +0300
@@ -302,7 +302,6 @@
 dnl .
 dnl -------------------------------------------------------------------------
 
-PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
 PHP_SAPI=default
@@ -327,7 +326,6 @@
 
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS
-  PTHREADS_FLAGS
 fi
 
 divert(3)
@@ -566,6 +564,7 @@
 memmove \
 mkstemp \
 mmap \
+nanosleep \
 nl_langinfo \
 perror \
 poll \
@@ -611,8 +610,6 @@
 asprintf \
 )
 
-dnl Some systems (like OpenSolaris) do not have nanosleep in libc
-PHP_CHECK_FUNC_LIB(nanosleep, rt)
 
 dnl Check for getaddrinfo, should be a better way, but...
 dnl Also check for working getaddrinfo
@@ -1162,7 +1159,7 @@
 EXPANDED_DATADIR=$datadir
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.:${prefix}/share/pear
 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir
@@ -1373,22 +1370,19 @@
   pharcmd_install=
 fi;
 
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd"
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
 
 case $PHP_SAPI in
-  cli)
-    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-    ;;
-  *)
-    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
+  apache|apache2handler|apache2filter)
+    install_targets="install-sapi $install_targets"
     ;;
 esac
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
 
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)