X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure.in;h=29f0cce1c5e412a403aa3e164f530e563c82baab;hp=379a705ddcd23a4821ea12ffc37ac177ec1d1027;hb=03cbf5c46f9256e202a208aaf9650fd8332fec1d;hpb=3ce2c58251fe1353768cc630103cdb12ecc8be0a

diff --git a/configure.in b/configure.in
index 379a705d..29f0cce1 100644
--- 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.471 2009/06/13 21:40:19 tom Exp $
+dnl $Id: configure.in,v 1.475 2009/10/17 12:38:32 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.471 $)
+AC_REVISION($Revision: 1.475 $)
 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],
@@ -445,7 +445,7 @@ if test "$use_database" != no ; then
 	AC_DEFINE(USE_DATABASE)
 
 	AC_MSG_CHECKING(which terminfo source-file will be installed)
-	AC_ARG_ENABLE(database,
+	AC_ARG_WITH(database,
 		[  --with-database=XXX     specify terminfo source to install],
 		[TERMINFO_SRC=$withval])
 	AC_MSG_RESULT($TERMINFO_SRC)
@@ -829,6 +829,15 @@ AC_ARG_WITH(mmask-t,
 	[NCURSES_MMASK_T=auto])
 AC_MSG_RESULT($NCURSES_MMASK_T)
 
+###   use option --with-ccharw-max to override CCHARW_MAX size
+AC_MSG_CHECKING(for size CCHARW_MAX)
+AC_ARG_WITH(ccharw-max,
+	[  --with-ccharw-max=XXX   override size CCHARW_MAX],
+	[NCURSES_CCHARW_MAX="$withval"],
+	[NCURSES_CCHARW_MAX=5])
+AC_MSG_RESULT($NCURSES_CCHARW_MAX)
+AC_SUBST(NCURSES_CCHARW_MAX)
+
 ### Enable compiling-in rcs id's
 AC_MSG_CHECKING(if RCS identifiers should be compiled-in)
 AC_ARG_WITH(rcs-ids,
@@ -870,7 +879,7 @@ AC_SUBST(GENERATED_EXT_FUNCS)
 
 AC_MSG_CHECKING(if you want to build with experimental SCREEN extensions)
 AC_ARG_ENABLE(sp-funcs,
-	[  --enable-sp-funcs       disable experimental SCREEN-extensions],
+	[  --enable-sp-funcs       enable experimental SCREEN-extensions],
 	[with_sp_funcs=$enableval],
 	[with_sp_funcs=no])
 AC_MSG_RESULT($with_sp_funcs)
@@ -885,6 +894,16 @@ fi
 AC_SUBST(NCURSES_SP_FUNCS)
 AC_SUBST(GENERATED_SP_FUNCS)
 
+AC_MSG_CHECKING(if you want to build with experimental terminal-driver)
+AC_ARG_ENABLE(term-driver,
+	[  --enable-term-driver    enable experimental terminal-driver],
+	[with_term_driver=$enableval],
+	[with_term_driver=no])
+AC_MSG_RESULT($with_term_driver)
+if test "$with_term_driver" = yes ; then
+	AC_DEFINE(USE_TERM_DRIVER)
+fi
+
 ###   use option --enable-const to turn on use of const beyond that in XSI.
 AC_MSG_CHECKING(for extended use of const keyword)
 AC_ARG_ENABLE(const,
@@ -1624,18 +1643,21 @@ if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termc
 	fi
 fi
 
-LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers"
+LIB_SUBSETS="${LIB_SUBSETS}termlib"
+test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
 
-case $cf_cv_system_name in #(vi
-*mingw32*) #(vi
-	LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con"
-	;;
-*) #(vi
-	LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo"
-	;;
-esac
+if test "$with_term_driver" != no ; then
+	LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
+	case $cf_cv_system_name in #(vi
+	*mingw32*) #(vi
+		LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con"
+		;;
+	*) #(vi
+		LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo"
+		;;
+	esac
+fi
 
-test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
 if test "$with_termlib" != no ; then
 	LIB_SUBSETS="${LIB_SUBSETS} "
 else
@@ -1863,6 +1885,7 @@ else
 MAKE_PC_FILES="#"
 fi
 AC_SUBST(MAKE_PC_FILES)
+AC_SUBST(cross_compiling)
 
 AC_OUTPUT( \
 	include/MKterm.h.awk \