ncurses 6.0 - patch 20150919

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 4af5a062c6ed792c7ee706161cf5d8331319272a..b0970642e8c22f57b5f797c502d1643178b7ceff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.613 2015/05/02 21:19:00 tom Exp $
+dnl $Id: configure.in,v 1.619 2015/08/05 23:32:27 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20030208)
-AC_REVISION($Revision: 1.613 $)
+AC_REVISION($Revision: 1.619 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -44,7 +44,7 @@ CF_SUBST_NCURSES_VERSION
 CF_VERSION_INFO(NCURSES,ncurses)
 
 CF_WITH_REL_VERSION(NCURSES)
-CF_WITH_ABI_VERSION
+CF_NCURSES_WITH_ABI_VERSION
 
 CF_WITH_SYSTYPE
 
@@ -868,20 +868,11 @@ AC_SUBST(NCURSES_OK_WCHAR_T)
 AC_SUBST(NCURSES_OK_WINT_T)
 
 ###   use option --disable-lp64 to allow long chtype
-case $cf_cv_abi_version in
-([[345]]*)
-       default_with_lp64=no
-       ;;
-(*)
-       default_with_lp64=yes
-       ;;
-esac
-
 AC_MSG_CHECKING(whether to enable _LP64 definition in curses.h)
 AC_ARG_ENABLE(lp64,
        [  --disable-lp64          allow chtype to be long (ignore _LP64)],
        [with_lp64=$enableval],
-       [with_lp64=$default_with_lp64])
+       [with_lp64=$cf_dft_with_lp64])
 AC_MSG_RESULT($with_lp64)
 
 if test "x$with_lp64" = xyes ; then
@@ -1045,6 +1036,9 @@ AC_ARG_ENABLE(term-driver,
 AC_MSG_RESULT($with_term_driver)
 if test "x$with_term_driver" = xyes ; then
        AC_DEFINE(USE_TERM_DRIVER,1,[Define to 1 to enable terminal-driver])
+       if test "x$with_termlib" != xno ; then
+               AC_MSG_ERROR(The term-driver option conflicts with the termlib option)
+       fi
        if test "x$with_sp_funcs" != xyes ; then
                AC_MSG_ERROR(The term-driver option relies upon sp-funcs)
        fi
@@ -2017,7 +2011,7 @@ fi
 CF_DIRS_TO_MAKE
 
 # symbols that differ when compiling Ada95 by itself.
-NCURSES_SHLIB2='sh $(top_srcdir)/misc/shlib'
+NCURSES_SHLIB2=$SHELL' $(top_srcdir)/misc/shlib'
 AC_SUBST(NCURSES_SHLIB2)
 
 # values to use as strings
@@ -2165,15 +2159,8 @@ cf_filter_syms=no
 
 if test -n "$RESULTING_SYMS"
 then
-       case $cf_cv_abi_version in
-       ([[6789]])
-               CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_version)
-               cf_filter_syms=yes
-               ;;
-       (*)
-               CF_VERBOSE(will map symbols to default ABI)
-               ;;
-       esac
+       cf_filter_syms=$cf_dft_filter_syms
+       CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_version)
 fi
 
 if test "x$WILDCARD_SYMS" = xno
@@ -2188,6 +2175,13 @@ then
 fi
 AC_SUBST(UNALTERED_SYMS)
 
+if test "x$cross_compiling" = xyes ; then
+       ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
+else
+       ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
+fi
+AC_SUBST(ADAGEN_LDFLAGS)
+
 AC_OUTPUT( \
        include/MKterm.h.awk \
        include/curses.head:include/curses.h.in \