ncurses 5.7 - patch 20100220

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 27b395ad3f9ec7a4a48e8de99bc2e555d5d005ac..0224f1b4aaeebc4c9f3b8a35dcea9fdbe745b6bd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.474 2009/09/26 22:36:43 tom Exp $
+dnl $Id: configure.in,v 1.482 2010/02/20 20:00:54 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.474 $)
+AC_REVISION($Revision: 1.482 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -169,8 +169,8 @@ if test "$PKG_CONFIG" != no ; then
        if test -z "$PKG_CONFIG_LIBDIR" ; then
                PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
        fi
-
-       if test -d "$PKG_CONFIG_LIBDIR" ; then
+       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
                AC_ARG_ENABLE(pc-files,
                        [  --enable-pc-files       generate and install .pc files for pkg-config],
                        [enable_pc_files=$enableval],
@@ -359,6 +359,7 @@ if test "$with_gpm" != no ; then
                SHLIB_LIST="-ldl $SHLIB_LIST"
        else
                SHLIB_LIST="-lgpm $SHLIB_LIST"
+               TEST_LIBS="-lgpm $TEST_LIBS"
        fi
        AC_DEFINE(HAVE_LIBGPM)
        CF_CHECK_GPM_WGETCH
@@ -902,6 +903,9 @@ AC_ARG_ENABLE(term-driver,
 AC_MSG_RESULT($with_term_driver)
 if test "$with_term_driver" = yes ; then
        AC_DEFINE(USE_TERM_DRIVER)
+       if test "$with_sp_funcs" != yes ; then
+               AC_MSG_ERROR(The term-driver option relies upon sp-funcs)
+       fi
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
@@ -1044,12 +1048,24 @@ test "$with_hashmap" = yes && AC_DEFINE(USE_HASHMAP)
 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 AC_MSG_CHECKING(if you want colorfgbg code)
 AC_ARG_ENABLE(colorfgbg,
-       [  --enable-colorfgbg      compile with $COLORFGBG code],
+       [  --enable-colorfgbg      compile-in experimental $COLORFGBG code],
        [with_colorfgbg=$enableval],
        [with_colorfgbg=no])
 AC_MSG_RESULT($with_colorfgbg)
 test "$with_colorfgbg" = yes && AC_DEFINE(USE_COLORFGBG)
 
+###   use option --enable-interop to turn on use of bindings used for interop
+AC_MSG_CHECKING(if you want interop bindings)
+AC_ARG_ENABLE(interop,
+       [  --enable-interop        compile-in experimental interop bindings],
+       [with_exp_interop=$enableval],
+       [with_exp_interop=no])
+AC_MSG_RESULT($with_exp_interop)
+
+NCURSES_INTEROP_FUNCS=0
+test "$with_exp_interop" = yes && NCURSES_INTEROP_FUNCS=1
+AC_SUBST(NCURSES_INTEROP_FUNCS)
+
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 CF_WITH_PTHREAD
@@ -1378,6 +1394,7 @@ CF_TYPE_SIGACTION
 CF_SIZECHANGE
 CF_FUNC_MEMMOVE
 CF_FUNC_POLL
+AC_FUNC_VFORK
 
 # special check for test/ditto.c
 CF_FUNC_OPENPTY
@@ -1646,6 +1663,16 @@ fi
 LIB_SUBSETS="${LIB_SUBSETS}termlib"
 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
 
+if test "$with_termlib" != no ; then
+       LIB_SUBSETS="${LIB_SUBSETS} "
+else
+       LIB_SUBSETS="${LIB_SUBSETS}+"
+fi
+
+LIB_SUBSETS="${LIB_SUBSETS}base"
+
+# Most term-driver calls are to tinfo, but some like init_pair are to the
+# base library (so it resides in base).
 if test "$with_term_driver" != no ; then
        LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
        case $cf_cv_system_name in #(vi
@@ -1658,14 +1685,6 @@ if test "$with_term_driver" != no ; then
        esac
 fi
 
-if test "$with_termlib" != no ; then
-       LIB_SUBSETS="${LIB_SUBSETS} "
-else
-       LIB_SUBSETS="${LIB_SUBSETS}+"
-fi
-
-LIB_SUBSETS="${LIB_SUBSETS}base"
-
 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"