diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2007-11-20 14:19:59 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2007-11-20 14:19:59 +0000 |
| commit | c41324baa0a705a55e55a824b9e3bb9eda947e54 (patch) | |
| tree | 857f67515b946d95317c1656ebe9b4d96cf94ff7 /configure.ac | |
| parent | a47971f5b7d4a21d71adcefaa0c0426f6bde8011 (diff) | |
| download | zsh-c41324baa0a705a55e55a824b9e3bb9eda947e54.tar.gz zsh-c41324baa0a705a55e55a824b9e3bb9eda947e54.tar.xz zsh-c41324baa0a705a55e55a824b9e3bb9eda947e54.zip | |
????? & 24104: attempt to fix error message on Tru64 Unix
24103: fix zsh.texi dependency on version 24104: dont search for ncurses library if no ncurses.h
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 31ab25d45..394178117 100644 --- a/configure.ac +++ b/configure.ac @@ -636,6 +636,17 @@ AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"]) AC_CHECK_LIB(m, pow) +dnl Various features of ncurses depend on having the right header +dnl (the system's own curses.h may well not be good enough). +dnl So don't search for ncurses unless we found the header. +if test x$ac_cv_header_ncurses_h = xyes; then + ncursesw_test=ncursesw + ncurses_test=ncurses +else + ncursesw_test= + ncurses_test= +fi + dnl Prefer BSD termcap library to SysV curses library, except on certain dnl SYSV-derived systems. However, if we find terminfo and termcap dnl stuff in the same library we will use that; typically this @@ -648,12 +659,13 @@ AC_HELP_STRING([--with-term-lib=LIBS], [search space-separated LIBS for terminal termcap_curses_order="$withval" AC_SEARCH_LIBS(tigetstr, [$termcap_curses_order]) else - termcap_curses_order="ncursesw tinfo termcap ncurses curses" + termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" fi], [case "$host_os" in hpux10.*|hpux11.*|solaris*) - termcap_curses_order="Hcurses ncursesw ncurses curses termcap" ;; - *) termcap_curses_order="ncursesw tinfo termcap ncurses curses" ;; + termcap_curses_order="Hcurses $ncursesw_test $ncurses_test curses termcap" ;; + *) + termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;; esac])dnl AH_TEMPLATE([HAVE_BOOLCODES], @@ -2357,7 +2369,8 @@ char *argv[]; esac fi case "$host_os" in - *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; + osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;; + *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; |