From f5bf3c10fdde7558e7f560af691dbfd8ab84b0f3 Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Tue, 21 Nov 2000 08:38:20 +0000
Subject: [PATCH] make HAVE_FOPENCOOKIE available for other extensions besides
 zlib

---
 acinclude.m4       | 39 +++++++++++++++++++++++++++++++++++++++
 ext/zlib/config.m4 | 40 +---------------------------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index c10e1b8a3c..9f68ecf3fe 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -883,3 +883,42 @@ int main(void) {
   fi
 ])
 
+AC_DEFUN(PHP_FOPENCOOKIE,[
+	AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ])
+
+	if test "$have_glibc_fopencookie" = "yes" ; then
+	  	dnl this comes in two flavors:
+      dnl newer glibcs (since 2.1.2 ? )
+      dnl have a type called cookie_io_functions_t
+		  AC_TRY_COMPILE([ #define _GNU_SOURCE
+                       #include <stdio.h>
+									   ],
+	                   [ cookie_io_functions_t cookie; ],
+                     [ have_cookie_io_functions_t=yes ],
+										 [ ] )
+
+		  if test "$have_cookie_io_functions_t" = "yes" ; then
+        cookie_io_functions_t=cookie_io_functions_t
+	      have_fopen_cookie=yes
+      else
+  	    dnl older glibc versions (up to 2.1.2 ?)
+        dnl call it _IO_cookie_io_functions_t
+		    AC_TRY_COMPILE([ #define _GNU_SOURCE
+                       #include <stdio.h>
+									   ],
+	                   [ _IO_cookie_io_functions_t cookie; ],
+                     [ have_IO_cookie_io_functions_t=yes ],
+										 [] )
+		    if test "$have_cookie_io_functions_t" = "yes" ; then
+          cookie_io_functions_t=_IO_cookie_io_functions_t
+	        have_fopen_cookie=yes
+		    fi
+			fi
+
+		  if test "$have_fopen_cookie" = "yes" ; then
+		    AC_DEFINE(HAVE_FOPENCOOKIE, 1, [ ])
+			  AC_DEFINE_UNQUOTED(COOKIE_IO_FUNCTIONS_T, $cookie_io_functions_t, [ ])
+      fi      
+
+  	fi
+])
diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index 86a7106ebd..5ce1287358 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -42,43 +42,5 @@ if test "$PHP_ZLIB" != "no"; then
   
   AC_ADD_INCLUDE($ZLIB_INCDIR)
 
-	dnl check for fopencookie() from glibc
-	AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ])
-
-	if test "$have_glibc_fopencookie" = "yes" ; then
-	  	dnl this comes in two flavors:
-      dnl newer glibcs (since 2.1.2 ? )
-      dnl have a type called cookie_io_functions_t
-		  AC_TRY_COMPILE([ #define _GNU_SOURCE
-                       #include <stdio.h>
-									   ],
-	                   [ cookie_io_functions_t cookie; ],
-                     [ have_cookie_io_functions_t=yes ],
-										 [ ] )
-
-		  if test "$have_cookie_io_functions_t" = "yes" ; then
-        cookie_io_functions_t=cookie_io_functions_t
-	      have_fopen_cookie=yes
-      else
-  	    dnl older glibc versions (up to 2.1.2 ?)
-        dnl call it _IO_cookie_io_functions_t
-		    AC_TRY_COMPILE([ #define _GNU_SOURCE
-                       #include <stdio.h>
-									   ],
-	                   [ _IO_cookie_io_functions_t cookie; ],
-                     [ have_IO_cookie_io_functions_t=yes ],
-										 [] )
-		    if test "$have_cookie_io_functions_t" = "yes" ; then
-          cookie_io_functions_t=_IO_cookie_io_functions_t
-	        have_fopen_cookie=yes
-		    fi
-			fi
-
-		  if test "$have_fopen_cookie" = "yes" ; then
-		    AC_DEFINE(HAVE_FOPENCOOKIE, 1, [ ])
-			  AC_DEFINE_UNQUOTED(COOKIE_IO_FUNCTIONS_T, $cookie_io_functions_t, [ ])
-      fi      
-
-  	fi
-
+  PHP_FOPENCOOKIE
 fi
-- 
2.50.1