ncurses 5.7 - patch 20100515

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index aed0dbdedeaba2c982bfe446b689b202047f68a3..c3fde742a0864d76d35b30ba0cb732d9dc26f362 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.484 2010/02/27 21:34:00 tom Exp $
+dnl $Id: configure.in,v 1.491 2010/05/15 21:40:14 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.484 $)
+AC_REVISION($Revision: 1.491 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -688,7 +688,7 @@ NCURSES_WCHAR_T=0
 NCURSES_WINT_T=0
 
 # Check to define _XOPEN_SOURCE "automatically"
-CF_XOPEN_SOURCE
+CF_XOPEN_SOURCE(500)
 
 # Work around breakage on OS X
 CF_SIGWINCH
@@ -709,7 +709,15 @@ AC_MSG_RESULT($with_widec)
 if test "$with_widec" = yes ; then
        LIB_SUFFIX="w${LIB_SUFFIX}"
        AC_DEFINE(USE_WIDEC_SUPPORT)
-       CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
+
+       case "$CFLAGS $CPPFLAGS" in #(vi
+       *-D_XOPEN_SOURCE=500) #(vi
+               ;;
+       *)
+               CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
+               ;;
+       esac
+
        # with_overwrite=no
        NCURSES_CH_T=cchar_t
        AC_CHECK_FUNCS(putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs)
@@ -1070,10 +1078,20 @@ AC_SUBST(NCURSES_INTEROP_FUNCS)
 # the script-block --with-normal, etc.
 CF_WITH_PTHREAD
 
+AC_MSG_CHECKING(if you want to allow EINTR in wgetch with pthreads)
+AC_ARG_ENABLE(pthreads-eintr,
+    [  --enable-pthreads-eintr enable EINTR in wgetch with pthreads],
+    [use_pthreads_eintr=$enableval],
+    [use_pthreads_eintr=no])
+AC_MSG_RESULT($use_pthreads_eintr)
+if test $use_pthreads_eintr = yes ; then
+    AC_DEFINE(USE_PTHREADS_EINTR)
+fi
+
 AC_MSG_CHECKING(if you want to use weak-symbols for pthreads)
 AC_ARG_ENABLE(weak-symbols,
     [  --enable-weak-symbols   enable weak-symbols for pthreads],
-    [use_weak_symbols=$withval],
+    [use_weak_symbols=$enableval],
     [use_weak_symbols=no])
 AC_MSG_RESULT($use_weak_symbols)
 if test "$use_weak_symbols" = yes ; then
@@ -1394,6 +1412,7 @@ CF_TYPE_SIGACTION
 CF_SIZECHANGE
 CF_FUNC_MEMMOVE
 CF_FUNC_POLL
+CF_VA_COPY
 AC_FUNC_VFORK
 
 # special check for test/ditto.c
@@ -1870,6 +1889,7 @@ CF_SRC_MODULES($modules_to_build)
 
 if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
    SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
+   SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in"
 fi
 
 CF_DIRS_TO_MAKE
@@ -1891,7 +1911,7 @@ CF_ADD_CFLAGS($EXTRA_CFLAGS)
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
-  CF_RPATH_HACK
+       CF_DISABLE_RPATH_HACK
 fi
 
 ### Define substitutions for header files to avoid name-pollution
@@ -1904,6 +1924,7 @@ test "$use_database" = yes && \
 SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
 
 SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
+SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${DFT_ARG_SUFFIX}${cf_cv_abi_version}-config.1:man/MKncu_config.in"
 
 if test x"$enable_pc_files" = xyes ; then \
 SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
@@ -1933,6 +1954,7 @@ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
 DFT_LWR_MODEL="$DFT_LWR_MODEL"
 ECHO_LINK="$ECHO_LINK"
 LDCONFIG="$LDCONFIG"
+LIBTOOL_VERSION="$LIBTOOL_VERSION"
 LIB_NAME="$LIB_NAME"
 LIB_SUBSETS="$LIB_SUBSETS"
 LIB_SUFFIX="$LIB_SUFFIX"