File php5-crypt-tests.patch of Package php5

File php5-crypt-tests.patch of Package php5 (Revision b0e0d1cbe7e68d0d3738a233e6610bd6)

Currently displaying revision b0e0d1cbe7e68d0d3738a233e6610bd6 , Show latest

Index: ext/standard/config.m4
===================================================================
--- ext/standard/config.m4.orig	2013-09-25 13:23:43.472777745 +0200
+++ ext/standard/config.m4	2013-09-25 13:28:29.744510495 +0200
@@ -2,7 +2,7 @@
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
-dnl
+
 AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], ac_cv_flush_io,[
 AC_TRY_RUN( [
 #include <stdio.h>
@@ -58,7 +58,14 @@
     AC_DEFINE(HAVE_CRYPT, 1, [ ])
   ])
 fi
-  
+ 
+if test "$ac_cv_func_crypt" = "no"; then
+  AC_CHECK_LIB(crypt, crypt_r, [
+    LIBS="-lcrypt $LIBS -lcrypt"
+    AC_DEFINE(HAVE_CRYPT_R, 1, [ ])
+  ])
+fi
+ 
 AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
@@ -233,7 +240,7 @@
 dnl
 dnl If one of them is missing, use our own implementation, portable code is then possible
 dnl
-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "x$ac_cv_lib_crypt_crypt_r" = "x0"; then
 
   dnl
   dnl Check for __alignof__ support in the compiler