ncurses 5.6 - patch 20070210

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 93542d236ff6656674146c2c973a3afd4031f75e..4696d24d3579db13a5ed28b3c499547dd0d1c96d 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.389 2007/01/21 00:30:30 tom Exp $
+dnl $Id: configure.in,v 1.395 2007/02/10 22:47:04 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.13.20020210)
-AC_REVISION($Revision: 1.389 $)
+AC_REVISION($Revision: 1.395 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -346,12 +346,16 @@ esac
 AC_SUBST(LD_MODEL)dnl          the type of link (e.g., -g or -pg)
 AC_MSG_RESULT($LD_MODEL)
 
+case $DFT_LWR_MODEL in
+shared)
 AC_MSG_CHECKING(if rpath option should be used)
 AC_ARG_ENABLE(rpath,
 [  --enable-rpath          use rpath option when generating shared libraries],
 [cf_cv_ld_rpath=$enableval],
 [cf_cv_ld_rpath=no])
 AC_MSG_RESULT($cf_cv_ld_rpath)
+       ;;
+esac
 
 CF_SHARED_OPTS
 if test "$CC_SHARED_OPTS" = "unknown"; then
@@ -497,6 +501,10 @@ if test "$with_termcap" != "yes" ; then
        AC_DEFINE(PURE_TERMINFO)
 else
 
+if test "$with_ticlib" != no ; then
+       AC_ERROR(Options --with-ticlib and --enable-termcap cannot be combined)
+fi
+
 AC_DEFINE(USE_TERMCAP)
 AC_MSG_CHECKING(for list of termcap files)
 CF_WITH_PATHLIST(termpath,
@@ -1217,7 +1225,6 @@ if test -n "$CXX" ; then
        CF_ETIP_DEFINES
        CF_CPP_PARAM_INIT
        CF_CPP_STATIC_CAST
-       CF_CPP_VSCAN_FUNC
 
        CXX_AR='$(AR)'
        CXX_AR_OPTS='$(AR_OPTS)'
@@ -1394,11 +1401,13 @@ fi
 AC_MSG_CHECKING(for library subsets)
 LIB_SUBSETS=
 
-test "$cf_with_progs"  = yes && LIB_SUBSETS="${LIB_SUBSETS}ticlib"
-if test "$with_ticlib" != no ; then
-       LIB_SUBSETS="${LIB_SUBSETS} "
-else
-       LIB_SUBSETS="${LIB_SUBSETS}+"
+if test "$cf_with_progs" = yes || test "$with_ticlib" != no; then
+       LIB_SUBSETS="${LIB_SUBSETS}ticlib"
+       if test "$with_ticlib" != no ; then
+               LIB_SUBSETS="${LIB_SUBSETS} "
+       else
+               LIB_SUBSETS="${LIB_SUBSETS}+"
+       fi
 fi
 
 LIB_SUBSETS="${LIB_SUBSETS}termlib"
@@ -1458,9 +1467,7 @@ fi
 
 # TICS_LIST and TINFO_LIST are needed to build the libtic.so and libterm.so
 TICS_LIST="$SHLIB_LIST"
-TINFO_LIST="$SHLIB_LIST"
-
-TICS_LEAKS=
+TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl//'`
 
 if test "$with_ticlib" != no ; then
 
@@ -1483,8 +1490,6 @@ AC_SUBST(TICS_DEP_SUFFIX)
 AC_SUBST(TICS_LIB_SUFFIX)
 AC_SUBST(TICS_ARGS)
 
-AC_SUBST(TICS_LEAKS)
-
 if test "$with_termlib" != no ; then
 
        if test "$with_termlib" != yes ; then