Skip to content

Commit 75fb748

Browse files
committed
Normalize comments in *nix build system m4 files
Normalization include: - Use dnl for everything that can be ommitted when configure is built in favor of the shell comment character # which is visible in the output. - Line length normalized to 80 columns - Dots for most of the one line sentences - Macro definitions include similar pattern header comments now
1 parent e96c776 commit 75fb748

File tree

83 files changed

+568
-699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+568
-699
lines changed

TSRM/threads.m4

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dnl OF THE POSSIBILITY OF SUCH DAMAGE.
2828
dnl
2929
dnl PTHREADS_FLAGS
3030
dnl
31-
dnl Set some magic defines to achieve POSIX threads conformance
31+
dnl Set some magic defines to achieve POSIX threads conformance.
3232
dnl
3333
AC_DEFUN([PTHREADS_FLAGS],[
3434
if test -z "$host_alias" && test -n "$host"; then
@@ -52,18 +52,17 @@ AC_DEFUN([PTHREADS_FLAGS],[
5252
PTHREAD_FLAGS=-D_REENTRANT;;
5353
*sco*)
5454
PTHREAD_FLAGS=-D_REENTRANT;;
55-
dnl Solves sigwait() problem, creates problems with u_long etc.
56-
dnl PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
5755
esac
5856
5957
if test -n "$PTHREAD_FLAGS"; then
6058
CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
6159
fi
62-
])dnl
60+
])
61+
6362
dnl
6463
dnl PTHREADS_CHECK_COMPILE
6564
dnl
66-
dnl Check whether the current setup can use POSIX threads calls
65+
dnl Check whether the current setup can use POSIX threads calls.
6766
dnl
6867
AC_DEFUN([PTHREADS_CHECK_COMPILE], [
6968
AC_LINK_IFELSE([ AC_LANG_SOURCE([
@@ -85,11 +84,12 @@ int main() {
8584
], [
8685
pthreads_checked=no
8786
]
88-
) ] )dnl
87+
) ] )
88+
8989
dnl
90-
dnl PTHREADS_CHECK()
90+
dnl PTHREADS_CHECK
9191
dnl
92-
dnl Try to find a way to enable POSIX threads
92+
dnl Try to find a way to enable POSIX threads.
9393
dnl
9494
dnl Magic flags
9595
dnl -kthread gcc (FreeBSD)
@@ -102,7 +102,6 @@ dnl -qthreaded AIX cc V5
102102
dnl -threads gcc (HP-UX)
103103
dnl
104104
AC_DEFUN([PTHREADS_CHECK],[
105-
106105
save_CFLAGS=$CFLAGS
107106
save_LIBS=$LIBS
108107
PTHREADS_ASSIGN_VARS
@@ -151,8 +150,12 @@ if test "$pthreads_working" = "yes"; then
151150
else
152151
threads_result="POSIX-Threads not found"
153152
fi
154-
])dnl
153+
])
154+
155155
dnl
156+
dnl PTHREADS_ASSIGN_VARS
157+
dnl
158+
dnl Adds pthreads linker and compiler flags.
156159
dnl
157160
AC_DEFUN([PTHREADS_ASSIGN_VARS],[
158161
if test -n "$ac_cv_pthreads_lib"; then
@@ -162,4 +165,4 @@ fi
162165
if test -n "$ac_cv_pthreads_cflags"; then
163166
CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
164167
fi
165-
])dnl
168+
])

TSRM/tsrm.m4

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
AC_DEFUN([TSRM_BASIC_CHECKS],[
1+
dnl This file contains TSRM specific autoconf macros.
22

3+
dnl
4+
dnl TSRM_BASIC_CHECKS
5+
dnl
6+
AC_DEFUN([TSRM_BASIC_CHECKS],[
37
AC_REQUIRE([AC_PROG_CC])dnl
48
AC_REQUIRE([AC_PROG_RANLIB])dnl
59
610
AC_CHECK_FUNCS(sigprocmask)
711
])
812

13+
dnl
14+
dnl TSRM_CHECK_PTH
15+
dnl
916
AC_DEFUN([TSRM_CHECK_PTH],[
10-
1117
AC_MSG_CHECKING(for GNU Pth)
1218
PTH_PREFIX="`$1 --prefix`"
1319
if test -z "$PTH_PREFIX"; then
@@ -20,9 +26,11 @@ LIBS="$LIBS `$1 --libs`"
2026
2127
AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
2228
AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
23-
2429
])
2530

31+
dnl
32+
dnl TSRM_CHECK_ST
33+
dnl
2634
AC_DEFUN([TSRM_CHECK_ST],[
2735
if test -r "$1/include/st.h"; then
2836
CPPFLAGS="$CPPFLAGS -I$1/include"
@@ -40,8 +48,10 @@ AC_DEFUN([TSRM_CHECK_ST],[
4048
AC_DEFINE(TSRM_ST, 1, [ ])
4149
])
4250

51+
dnl
52+
dnl TSRM_CHECK_PTHREADS
53+
dnl
4354
AC_DEFUN([TSRM_CHECK_PTHREADS],[
44-
4555
PTHREADS_CHECK
4656
4757
if test "$pthreads_working" != "yes"; then
@@ -54,11 +64,13 @@ AC_MSG_CHECKING(for POSIX threads)
5464
AC_MSG_RESULT(yes)
5565
])
5666

67+
dnl
68+
dnl TSRM_THREADS_CHECKS
69+
dnl
70+
dnl For the thread implementations, we always use --with-* to maintain
71+
dnl consistency.
72+
dnl
5773
AC_DEFUN([TSRM_THREADS_CHECKS],[
58-
59-
dnl For the thread implementations, we always use --with-*
60-
dnl to maintain consistency
61-
6274
AC_ARG_WITH([tsrm-pth],
6375
[AS_HELP_STRING([[--with-tsrm-pth[=pth-config]]],
6476
[Use GNU Pth])],
@@ -86,5 +98,4 @@ elif test "$TSRM_ST" != "no"; then
8698
elif test "$TSRM_PTHREADS" != "no"; then
8799
TSRM_CHECK_PTHREADS
88100
fi
89-
90101
])

Zend/Zend.m4

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
dnl This file contains Zend specific autoconf macros.
2+
13
dnl
2-
dnl This file contains Zend specific autoconf functions.
4+
dnl ZEND_CHECK_FLOAT_PRECISION
35
dnl
4-
56
dnl x87 floating point internal precision control checks
67
dnl See: http://wiki.php.net/rfc/rounding
8+
dnl
79
AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
810
AC_MSG_CHECKING([for usable _FPU_SETCW])
911
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -116,6 +118,11 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[
116118
fi
117119
])
118120

121+
dnl
122+
dnl LIBZEND_BASIC_CHECKS
123+
dnl
124+
dnl Basic checks specific for the Zend engine library.
125+
dnl
119126
AC_DEFUN([LIBZEND_BASIC_CHECKS],[
120127
AC_REQUIRE([AC_PROG_CC])
121128
@@ -130,10 +137,12 @@ unix.h \
130137
cpuid.h \
131138
dlfcn.h)
132139
133-
AC_DEFUN([LIBZEND_DLSYM_CHECK],[
140+
dnl
141+
dnl LIBZEND_DLSYM_CHECK
134142
dnl
135143
dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
136144
dnl
145+
AC_DEFUN([LIBZEND_DLSYM_CHECK],[
137146
AC_MSG_CHECKING([whether dlsym() requires a leading underscore in symbol names])
138147
_LT_AC_TRY_DLOPEN_SELF([
139148
AC_MSG_RESULT(no)
@@ -152,7 +161,7 @@ AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]])
152161
153162
ZEND_CHECK_FLOAT_PRECISION
154163
155-
dnl test whether double cast to long preserves least significant bits
164+
dnl Test whether double cast to long preserves least significant bits.
156165
AC_MSG_CHECKING(whether double cast to long preserves least significant bits)
157166
158167
AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -186,6 +195,9 @@ int main()
186195
187196
])
188197

198+
dnl
199+
dnl LIBZEND_OTHER_CHECKS
200+
dnl
189201
AC_DEFUN([LIBZEND_OTHER_CHECKS],[
190202
191203
AC_ARG_ENABLE([maintainer-zts],
@@ -247,8 +259,8 @@ else
247259
AC_MSG_RESULT(no)
248260
fi
249261
250-
dnl test and set the alignment define for ZEND_MM
251-
dnl this also does the logarithmic test for ZEND_MM.
262+
dnl Test and set the alignment define for ZEND_MM. This also does the
263+
dnl logarithmic test for ZEND_MM.
252264
AC_MSG_CHECKING(for MM alignment and log values)
253265
254266
AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -289,7 +301,7 @@ int main()
289301
AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ])
290302
AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ])
291303
], [], [
292-
dnl cross-compile needs something here
304+
dnl Cross compilation needs something here.
293305
LIBZEND_MM_ALIGN=8
294306
])
295307
@@ -392,9 +404,7 @@ else
392404
fi
393405
AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)
394406

395-
dnl
396-
dnl Check if atof() accepts NAN
397-
dnl
407+
dnl Check if atof() accepts NAN.
398408
AC_CACHE_CHECK(whether atof() accepts NAN, ac_cv_atof_accept_nan,[
399409
AC_RUN_IFELSE([AC_LANG_SOURCE([[
400410
#include <math.h>
@@ -423,9 +433,7 @@ if test "$ac_cv_atof_accept_nan" = "yes"; then
423433
AC_DEFINE([HAVE_ATOF_ACCEPTS_NAN], 1, [whether atof() accepts NAN])
424434
fi
425435

426-
dnl
427-
dnl Check if atof() accepts INF
428-
dnl
436+
dnl Check if atof() accepts INF.
429437
AC_CACHE_CHECK(whether atof() accepts INF, ac_cv_atof_accept_inf,[
430438
AC_RUN_IFELSE([AC_LANG_SOURCE([[
431439
#include <math.h>
@@ -457,9 +465,7 @@ if test "$ac_cv_atof_accept_inf" = "yes"; then
457465
AC_DEFINE([HAVE_ATOF_ACCEPTS_INF], 1, [whether atof() accepts INF])
458466
fi
459467

460-
dnl
461-
dnl Check if HUGE_VAL == INF
462-
dnl
468+
dnl Check if HUGE_VAL == INF.
463469
AC_CACHE_CHECK(whether HUGE_VAL == INF, ac_cv_huge_val_inf,[
464470
AC_RUN_IFELSE([AC_LANG_SOURCE([[
465471
#include <math.h>
@@ -492,9 +498,7 @@ if test "$ac_cv_huge_val_inf" = "yes"; then
492498
AC_DEFINE([HAVE_HUGE_VAL_INF], 1, [whether HUGE_VAL == INF])
493499
fi
494500

495-
dnl
496-
dnl Check if HUGE_VAL + -HUGEVAL == NAN
497-
dnl
501+
dnl Check if HUGE_VAL + -HUGEVAL == NAN.
498502
AC_CACHE_CHECK(whether HUGE_VAL + -HUGEVAL == NAN, ac_cv_huge_val_nan,[
499503
AC_RUN_IFELSE([AC_LANG_SOURCE([[
500504
#include <math.h>
@@ -529,9 +533,7 @@ if test "$ac_cv_huge_val_nan" = "yes"; then
529533
AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
530534
fi
531535

532-
dnl
533-
dnl Check whether __cpuid_count is available
534-
dnl
536+
dnl Check whether __cpuid_count is available.
535537
AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
536538
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
537539
#include <cpuid.h>

0 commit comments

Comments
 (0)