Skip to content

Commit 59cf88d

Browse files
committed
Ignore libedit/libreadline while probing for strlcpy and some other
standard functions. Per report from Stefan Kaltenbrunner.
1 parent ae8c1be commit 59cf88d

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

configure

+7
Original file line numberDiff line numberDiff line change
@@ -14509,6 +14509,11 @@ done
1450914509

1451014510
fi
1451114511

14512+
# Some versions of libedit contain strlcpy(); so disregard that library while
14513+
# checking for these standard libc functions.
14514+
pgac_save_LIBS="$LIBS"
14515+
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
14516+
1451214517

1451314518

1451414519

@@ -14635,6 +14640,8 @@ done
1463514640

1463614641

1463714642

14643+
LIBS="$pgac_save_LIBS"
14644+
1463814645
# System's version of getaddrinfo(), if any, may be used only if we found
1463914646
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
1464014647
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available

configure.in

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.488 2006/11/25 03:34:10 pgsql Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.489 2006/11/29 20:12:31 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -966,8 +966,15 @@ else
966966
AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
967967
fi
968968

969+
# Some versions of libedit contain strlcpy(); so disregard that library while
970+
# checking for these standard libc functions.
971+
pgac_save_LIBS="$LIBS"
972+
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
973+
969974
AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv])
970975

976+
LIBS="$pgac_save_LIBS"
977+
971978
# System's version of getaddrinfo(), if any, may be used only if we found
972979
# a definition for struct addrinfo; see notes in src/include/getaddrinfo.h.
973980
# (Note: the AC_REPLACE_FUNCS probe fails on Windows, where the available

0 commit comments

Comments
 (0)