diff options
| author | Peter Eisentraut | 2001-08-28 14:59:11 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2001-08-28 14:59:11 +0000 |
| commit | 5298eb47dc11e42eddcbda2ac8a4794361f34d2c (patch) | |
| tree | bbdbf1102a1a104db35f86c2ace0714cbf2c8b51 /config | |
| parent | f5944af8ba020b26741845c59682e6bd835beb07 (diff) | |
Fix the readline test to find dependent libraries on NetBSD and OpenBSD.
Not pretty, but it doesn't look like the OS will get fixed sometime soon.
Diffstat (limited to 'config')
| -rw-r--r-- | config/programs.m4 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/config/programs.m4 b/config/programs.m4 index 19acccffeba..e60242a888b 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/config/programs.m4,v 1.6 2001/08/06 15:46:44 petere Exp $ +# $Header: /cvsroot/pgsql/config/programs.m4,v 1.7 2001/08/28 14:59:11 petere Exp $ # PGAC_PATH_FLEX @@ -77,7 +77,8 @@ AC_SUBST(FLEXFLAGS) # Add the required flags to LIBS, define HAVE_LIBREADLINE. AC_DEFUN([PGAC_CHECK_READLINE], -[AC_MSG_CHECKING([for readline]) +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_MSG_CHECKING([for readline]) AC_CACHE_VAL([pgac_cv_check_readline], [pgac_cv_check_readline=no @@ -85,7 +86,19 @@ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do for pgac_rllib in -lreadline -ledit ; do pgac_save_LIBS=$LIBS LIBS="${pgac_rllib}${pgac_lib} $LIBS" - AC_TRY_LINK_FUNC([readline], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]) + AC_TRY_LINK_FUNC([readline], [[ + # NetBSD and OpenBSD have a broken linker that does not + # recognize dependent libraries + case $host_os in netbsd* | openbsd* ) + case $pgac_lib in + *curses*) ;; + *) pgac_lib=" -lcurses" ;; + esac + esac + + pgac_cv_check_readline="${pgac_rllib}${pgac_lib}" + break 2 + ]]) LIBS=$pgac_save_LIBS done done |