Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bfa6c5a

Browse files
committed
Convert some long lists in configure.in to one-line-per-entry style.
The idea here is that patches that add items to these lists will often be easier to rebase over other additions to the same lists, because they won't be trying to touch the very same line of configure.in. There will still be merge conflicts in the configure script, but that can be fixed just by re-running autoconf (or by leaving configure out of the submitted patch to begin with ...) Implementation note: use of m4_normalize() is necessary to get rid of the newlines, else incorrect shell syntax will be emitted. But with that hack, the generated configure script is identical to what it was before. Discussion: https://postgr.es/m/19344.1539050134@sss.pgh.pa.us
1 parent 212fab9 commit bfa6c5a

File tree

1 file changed

+69
-3
lines changed

1 file changed

+69
-3
lines changed

configure.in

+69-3
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,34 @@ AC_SUBST(UUID_LIBS)
12921292

12931293
AC_HEADER_STDBOOL
12941294

1295-
AC_CHECK_HEADERS([atomic.h crypt.h fp_class.h getopt.h ieeefp.h ifaddrs.h langinfo.h mbarrier.h poll.h sys/epoll.h sys/ipc.h sys/prctl.h sys/procctl.h sys/pstat.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/tas.h sys/un.h termios.h ucred.h utime.h wchar.h wctype.h])
1295+
AC_CHECK_HEADERS(m4_normalize([
1296+
atomic.h
1297+
crypt.h
1298+
fp_class.h
1299+
getopt.h
1300+
ieeefp.h
1301+
ifaddrs.h
1302+
langinfo.h
1303+
mbarrier.h
1304+
poll.h
1305+
sys/epoll.h
1306+
sys/ipc.h
1307+
sys/prctl.h
1308+
sys/procctl.h
1309+
sys/pstat.h
1310+
sys/resource.h
1311+
sys/select.h
1312+
sys/sem.h
1313+
sys/shm.h
1314+
sys/sockio.h
1315+
sys/tas.h
1316+
sys/un.h
1317+
termios.h
1318+
ucred.h
1319+
utime.h
1320+
wchar.h
1321+
wctype.h
1322+
]))
12961323

12971324
# On BSD, test for net/if.h will fail unless sys/socket.h
12981325
# is included first.
@@ -1571,7 +1598,32 @@ PGAC_FUNC_WCSTOMBS_L
15711598
LIBS_including_readline="$LIBS"
15721599
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
15731600

1574-
AC_CHECK_FUNCS([cbrt clock_gettime fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll posix_fallocate ppoll pstat pthread_is_threaded_np readlink setproctitle setproctitle_fast setsid shm_open strchrnul symlink sync_file_range utime utimes wcstombs_l])
1601+
AC_CHECK_FUNCS(m4_normalize([
1602+
cbrt
1603+
clock_gettime
1604+
fdatasync
1605+
getifaddrs
1606+
getpeerucred
1607+
getrlimit
1608+
mbstowcs_l
1609+
memmove
1610+
poll
1611+
posix_fallocate
1612+
ppoll
1613+
pstat
1614+
pthread_is_threaded_np
1615+
readlink
1616+
setproctitle
1617+
setproctitle_fast
1618+
setsid
1619+
shm_open
1620+
strchrnul
1621+
symlink
1622+
sync_file_range
1623+
utime
1624+
utimes
1625+
wcstombs_l
1626+
]))
15751627

15761628
AC_REPLACE_FUNCS(fseeko)
15771629
case $host_os in
@@ -1640,7 +1692,21 @@ else
16401692
AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
16411693
fi
16421694

1643-
AC_REPLACE_FUNCS([crypt dlopen fls getopt getrusage inet_aton mkdtemp random rint srandom strlcat strlcpy strnlen])
1695+
AC_REPLACE_FUNCS(m4_normalize([
1696+
crypt
1697+
dlopen
1698+
fls
1699+
getopt
1700+
getrusage
1701+
inet_aton
1702+
mkdtemp
1703+
random
1704+
rint
1705+
srandom
1706+
strlcat
1707+
strlcpy
1708+
strnlen
1709+
]))
16441710

16451711
case $host_os in
16461712

0 commit comments

Comments
 (0)