gstein 01/02/27 03:34:50
Modified: . configure.in
build apr_common.m4
Log:
* configure.in: just call APR_FLAG_HEADERS once. This allows autoconf to
loop over the values *once* rather than substituting N loops for header
checking. This drops configure's size from 340k down to 255k. (!!!)
* apr_common.m4: M4 sees the shell's backslash, so treat it as whitespace in
APR_COMMA_ARGS
Revision Changes Path
1.249 +63 -59 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -u -r1.248 -r1.249
--- configure.in 2001/02/26 23:34:44 1.248
+++ configure.in 2001/02/27 11:34:46 1.249
@@ -402,65 +402,69 @@
dnl #----------------------------- Checks for Any required Headers
AC_HEADER_STDC
-APR_FLAG_HEADERS(ByteOrder.h)
-APR_FLAG_HEADERS(conio.h)
-APR_FLAG_HEADERS(crypt.h)
-APR_FLAG_HEADERS(ctype.h)
-APR_FLAG_HEADERS(dir.h)
-APR_FLAG_HEADERS(dirent.h)
-APR_FLAG_HEADERS(errno.h)
-APR_FLAG_HEADERS(net/errno.h)
-APR_FLAG_HEADERS(fcntl.h)
-APR_FLAG_HEADERS(grp.h)
-APR_FLAG_HEADERS(io.h)
-APR_FLAG_HEADERS(limits.h)
-APR_FLAG_HEADERS(malloc.h)
-APR_FLAG_HEADERS(memory.h)
-APR_FLAG_HEADERS(netdb.h)
-APR_FLAG_HEADERS(osreldate.h)
-APR_FLAG_HEADERS(process.h)
-APR_FLAG_HEADERS(pwd.h)
-APR_FLAG_HEADERS(sys/syslimits.h)
-APR_FLAG_HEADERS(sys/sem.h)
-APR_FLAG_HEADERS(signal.h)
-APR_FLAG_HEADERS(stdarg.h)
-APR_FLAG_HEADERS(stddef.h)
-APR_FLAG_HEADERS(stdio.h)
-APR_FLAG_HEADERS(stdlib.h)
-APR_FLAG_HEADERS(string.h)
-APR_FLAG_HEADERS(strings.h)
-APR_FLAG_HEADERS(sysapi.h)
-APR_FLAG_HEADERS(sysgtime.h)
-APR_FLAG_HEADERS(termios.h)
-APR_FLAG_HEADERS(time.h)
-APR_FLAG_HEADERS(sys/time.h)
-APR_FLAG_HEADERS(tpfeq.h)
-APR_FLAG_HEADERS(tpfio.h)
-APR_FLAG_HEADERS(sys/uio.h)
-APR_FLAG_HEADERS(unistd.h)
-APR_FLAG_HEADERS(poll.h)
-APR_FLAG_HEADERS(sys/poll.h)
-APR_FLAG_HEADERS(unix.h)
-APR_FLAG_HEADERS(arpa/inet.h)
-APR_FLAG_HEADERS(netinet/in.h)
-APR_FLAG_HEADERS(netinet/tcp.h)
-APR_FLAG_HEADERS(iconv.h)
-APR_FLAG_HEADERS(langinfo.h)
-
-APR_FLAG_HEADERS(sys/file.h)
-APR_FLAG_HEADERS(sys/mman.h)
-APR_FLAG_HEADERS(sys/resource.h)
-APR_FLAG_HEADERS(sys/select.h)
-APR_FLAG_HEADERS(sys/sendfile.h)
-APR_FLAG_HEADERS(sys/signal.h)
-APR_FLAG_HEADERS(sys/socket.h)
-APR_FLAG_HEADERS(sys/stat.h)
-APR_FLAG_HEADERS(sys/types.h)
-APR_FLAG_HEADERS(sys/wait.h)
-APR_FLAG_HEADERS(dlfcn.h)
-APR_FLAG_HEADERS(dl.h)
-
-APR_FLAG_HEADERS(kernel/OS.h)
+APR_FLAG_HEADERS(
+ ByteOrder.h \
+ conio.h \
+ crypt.h \
+ ctype.h \
+ dir.h \
+ dirent.h \
+ dl.h \
+ dlfcn.h \
+ errno.h \
+ fcntl.h \
+ grp.h \
+ iconv.h \
+ io.h \
+ langinfo.h \
+ limits.h \
+ malloc.h \
+ memory.h \
+ netdb.h \
+ osreldate.h \
+ poll.h \
+ process.h \
+ pwd.h \
+ signal.h \
+ stdarg.h \
+ stddef.h \
+ stdio.h \
+ stdlib.h \
+ string.h \
+ strings.h \
+ sysapi.h \
+ sysgtime.h \
+ termios.h \
+ time.h \
+ tpfeq.h \
+ tpfio.h \
+ unistd.h \
+ unix.h \
+ \
+ arpa/inet.h \
+ \
+ kernel/OS.h \
+ \
+ net/errno.h \
+ \
+ netinet/in.h \
+ netinet/tcp.h \
+ \
+ sys/file.h \
+ sys/mman.h \
+ sys/poll.h \
+ sys/resource.h \
+ sys/select.h \
+ sys/sem.h \
+ sys/sendfile.h \
+ sys/signal.h \
+ sys/socket.h \
+ sys/stat.h \
+ sys/syslimits.h \
+ sys/time.h \
+ sys/types.h \
+ sys/uio.h \
+ sys/wait.h)
AC_SUBST(arpa_ineth)
AC_SUBST(conioh)
1.9 +7 -4 apr/build/apr_common.m4
Index: apr_common.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_common.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- apr_common.m4 2001/02/27 11:09:43 1.8
+++ apr_common.m4 2001/02/27 11:34:49 1.9
@@ -333,9 +333,12 @@
])dnl
-dnl the following is a newline, a space, and a tab. don't reindent!
-define([newline_space_tab],[
- ])
+dnl the following is a newline, a space, a tab, and a backslash (the
+dnl backslash is used by the shell to skip newlines, but m4 sees it;
+dnl treat it like whitespace).
+dnl WARNING: don't reindent these lines, or the space/tab will be lost!
+define([apr_whitespace],[
+ \])
dnl
dnl APR_COMMA_ARGS(ARG1 ...)
@@ -347,7 +350,7 @@
dnl within each iteration.
dnl
changequote({,})
-define({APR_COMMA_ARGS},{patsubst([$}{1],[[}newline_space_tab{]+],[,])})
+define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
define({APR_FOREACH},
{ifelse($}{2,,,
[define([eachval],
