Commitc833c6c

committed

Hack to work around broken linker on older NetBSD/OpenBSD/Irix assumed

that readline must depend on libcurses, but it seems more recent onesuse libtermcap instead. Allow that case.

1 parentd765891 commitc833c6cCopy full SHA for c833c6c

File tree

+17

-15

lines changed

+17

-15

lines changed

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/config/programs.m4,v 1.17 2004/11/30 06:13:02 tgl Exp $`
	`1`	`+# $PostgreSQL: pgsql/config/programs.m4,v 1.18 2004/12/02 20:04:19 tgl Exp $`
`2`	`2`
`3`	`3`
`4`	`4`	`# PGAC_PATH_FLEX`
`@@ -87,13 +87,14 @@ for pgac_rllib in -lreadline -ledit ; do`
`87`	`87`	`for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do`
`88`	`88`	`LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"`
`89`	`89`	`AC_TRY_LINK_FUNC([readline],[[`
`90`		`- # NetBSD, OpenBSD, and Irix have a broken linker that does not`
`91`		`- # recognize dependent libraries`
`92`		`- case $host_os in netbsd* \| openbsd* \| irix*)`
`93`		`- case $pgac_lib in`
`94`		`- curses) ;;`
`95`		`- *) pgac_lib=" -lcurses" ;;`
`96`		`- esac`
	`90`	`+ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not`
	`91`	`+ # recognize dependent libraries; assume curses is needed if we didn't`
	`92`	`+ # find any dependency.`
	`93`	`+ case $host_os in`
	`94`	`+ netbsd* \| openbsd* \| irix*)`
	`95`	`+ if test x"$pgac_lib" = x"" ; then`
	`96`	`+ pgac_lib=" -lcurses"`
	`97`	`+ fi ;;`
`97`	`98`	`esac`
`98`	`99`
`99`	`100`	`pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -5996,13 +5996,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5`
`5996`	`5996`	`echo "$as_me:$LINENO: \$? = $ac_status" >&5`
`5997`	`5997`	`(exit $ac_status); }; }; then`
`5998`	`5998`
`5999`		`- # NetBSD, OpenBSD, and Irix have a broken linker that does not`
`6000`		`- # recognize dependent libraries`
`6001`		`- case $host_os in netbsd* \| openbsd* \| irix*)`
`6002`		`- case $pgac_lib in`
`6003`		`- curses) ;;`
`6004`		`- *) pgac_lib=" -lcurses" ;;`
`6005`		`- esac`
	`5999`	`+ # Older NetBSD, OpenBSD, and Irix have a broken linker that does not`
	`6000`	`+ # recognize dependent libraries; assume curses is needed if we didn't`
	`6001`	`+ # find any dependency.`
	`6002`	`+ case $host_os in`
	`6003`	`+ netbsd* \| openbsd* \| irix*)`
	`6004`	`+ if test x"$pgac_lib" = x"" ; then`
	`6005`	`+ pgac_lib=" -lcurses"`
	`6006`	`+ fi ;;`
`6006`	`6007`	`esac`
`6007`	`6008`
`6008`	`6009`	`pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"`

Comments

(0)