summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2004-12-02 20:04:20 +0000
committerTom Lane2004-12-02 20:04:20 +0000
commit440bdeb0535d13145f4069c78f68d71cd85eaf2f (patch)
treef51467e98ad8cafb3f6b27b05e1028e97aa917a4
parente6b91123e0e42e671ed74aa2dee472ca3a8676fc (diff)
Hack to work around broken linker on older NetBSD/OpenBSD/Irix assumed
that readline must depend on libcurses, but it seems more recent ones use libtermcap instead. Allow that case.
-rw-r--r--config/programs.m415
-rwxr-xr-xconfigure15
2 files changed, 16 insertions, 14 deletions
diff --git a/config/programs.m4 b/config/programs.m4
index 9182a0972b..ad3e4a43b2 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -87,13 +87,14 @@ for pgac_rllib in -lreadline -ledit ; do
for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
AC_TRY_LINK_FUNC([readline], [[
- # NetBSD, OpenBSD, and Irix have a broken linker that does not
- # recognize dependent libraries
- case $host_os in netbsd* | openbsd* | irix*)
- case $pgac_lib in
- *curses*) ;;
- *) pgac_lib=" -lcurses" ;;
- esac
+ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not
+ # recognize dependent libraries; assume curses is needed if we didn't
+ # find any dependency.
+ case $host_os in
+ netbsd* | openbsd* | irix*)
+ if test x"$pgac_lib" = x"" ; then
+ pgac_lib=" -lcurses"
+ fi ;;
esac
pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"
diff --git a/configure b/configure
index 378cd61291..3adda4f71e 100755
--- a/configure
+++ b/configure
@@ -5996,13 +5996,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- # NetBSD, OpenBSD, and Irix have a broken linker that does not
- # recognize dependent libraries
- case $host_os in netbsd* | openbsd* | irix*)
- case $pgac_lib in
- *curses*) ;;
- *) pgac_lib=" -lcurses" ;;
- esac
+ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not
+ # recognize dependent libraries; assume curses is needed if we didn't
+ # find any dependency.
+ case $host_os in
+ netbsd* | openbsd* | irix*)
+ if test x"$pgac_lib" = x"" ; then
+ pgac_lib=" -lcurses"
+ fi ;;
esac
pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"