Attachment #208689 for bug #281697

View | Details | Raw Unified | Return to bug 281697
Collapse All | Expand All




## $Id: configure.in 288372 2009-09-16 12:54:51Z iliaa $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.

dnl m4_divert(1)

dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile


sinclude(main/suhosin_patch.m4)

dnl m4_divert(2)

dnl ## Diversion 2 is where we set PHP-specific options and come up
dnl ## with reasonable default values for them. We check for pthreads here

  PTHREADS_FLAGS
fi

dnl m4_divert(3)

dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.

  PHP_CRYPT_R_STYLE
fi

dnl m4_divert(4)

dnl ## In diversion 4 we check user-configurable general settings.


  AC_MSG_RESULT([using system default])
fi

dnl m4_divert(5)

dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.

Lines 1-6 Link Here

(-)ext/standard/config.m4.old (-2 / +2 lines)
1	dnl $Id: config.m4 286890 2009-08-06 14:07:16Z scottmac $ -- autoconf --	1	dnl $Id: config.m4 286890 2009-08-06 14:07:16Z scottmac $ -- autoconf --
2		2
3	divert(3)dnl	3	dnl m4_divert(3)dnl
4		4
5	dnl	5	dnl
6	dnl Check if flush should be called explicitly after buffered io	6	dnl Check if flush should be called explicitly after buffered io
Lines 205-211 Link Here
205	AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)	205	AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
206	AC_FUNC_FNMATCH	206	AC_FUNC_FNMATCH
207		207
208	divert(5)dnl	208	dnl m4_divert(5)dnl
209		209
210	dnl	210	dnl
211	dnl Check for regex library type	211	dnl Check for regex library type

Return to bug 281697

Lines 1-7 Link Here

(-)configure.in.old (-5 / +5 lines)
1	## $Id: configure.in 288372 2009-09-16 12:54:51Z iliaa $ -- autoconf --	1	## $Id: configure.in 288372 2009-09-16 12:54:51Z iliaa $ -- autoconf --
2	dnl ## Process this file with autoconf to produce a configure script.	2	dnl ## Process this file with autoconf to produce a configure script.
3		3
4	divert(1)	4	dnl m4_divert(1)
5		5
6	dnl ## Diversion 1 is the autoconf + automake setup phase. We also	6	dnl ## Diversion 1 is the autoconf + automake setup phase. We also
7	dnl ## set the PHP version, deal with platform-specific compile	7	dnl ## set the PHP version, deal with platform-specific compile
Lines 264-270 Link Here
264		264
265	sinclude(main/suhosin_patch.m4)	265	sinclude(main/suhosin_patch.m4)
266		266
267	divert(2)	267	dnl m4_divert(2)
268		268
269	dnl ## Diversion 2 is where we set PHP-specific options and come up	269	dnl ## Diversion 2 is where we set PHP-specific options and come up
270	dnl ## with reasonable default values for them. We check for pthreads here	270	dnl ## with reasonable default values for them. We check for pthreads here
Lines 303-309 Link Here
303	PTHREADS_FLAGS	303	PTHREADS_FLAGS
304	fi	304	fi
305		305
306	divert(3)	306	dnl m4_divert(3)
307		307
308	dnl ## In diversion 3 we check for compile-time options to the PHP	308	dnl ## In diversion 3 we check for compile-time options to the PHP
309	dnl ## core and how to deal with different system dependencies.	309	dnl ## core and how to deal with different system dependencies.
Lines 662-668 Link Here
662	PHP_CRYPT_R_STYLE	662	PHP_CRYPT_R_STYLE
663	fi	663	fi
664		664
665	divert(4)	665	dnl m4_divert(4)
666		666
667	dnl ## In diversion 4 we check user-configurable general settings.	667	dnl ## In diversion 4 we check user-configurable general settings.
668		668
Lines 903-909 Link Here
903	AC_MSG_RESULT([using system default])	903	AC_MSG_RESULT([using system default])
904	fi	904	fi
905		905
906	divert(5)	906	dnl m4_divert(5)
907		907
908	dnl ## In diversion 5 we check which extensions should be compiled.	908	dnl ## In diversion 5 we check which extensions should be compiled.
909	dnl ## All of these are normally in the extension directories.	909	dnl ## All of these are normally in the extension directories.