X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=aclocal.m4;h=dbc6baa2d118d388b6015accfee8c7794253ac30;hp=efaa3949c2195223706f4e6737b84bb7c3cf6fd0;hb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c diff --git a/aclocal.m4 b/aclocal.m4 index efaa3949..dbc6baa2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,29 +1,41 @@ -dnl***************************************************************************** -dnl Copyright 1996,1997 by Thomas E. Dickey * -dnl All Rights Reserved. * -dnl * -dnl Permission to use, copy, modify, and distribute this software and its * -dnl documentation for any purpose and without fee is hereby granted, provided * -dnl that the above copyright notice appear in all copies and that both that * -dnl copyright notice and this permission notice appear in supporting * -dnl documentation, and that the name of the above listed copyright holder(s) * -dnl not be used in advertising or publicity pertaining to distribution of the * -dnl software without specific, written prior permission. THE ABOVE LISTED * -dnl COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * -dnl EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY * -dnl SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER * -dnl RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * -dnl CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * -dnl CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * -dnl***************************************************************************** -dnl $Id: aclocal.m4,v 1.60 1997/05/10 15:56:16 tom Exp $ +dnl*************************************************************************** +dnl Copyright (c) 1998 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 * +dnl "Software"), to deal in the Software without restriction, including * +dnl without limitation the rights to use, copy, modify, merge, publish, * +dnl distribute, distribute with modifications, sublicense, and/or sell * +dnl copies of the Software, and to permit persons to whom the Software is * +dnl furnished to do so, subject to the following conditions: * +dnl * +dnl The above copyright notice and this permission notice shall be included * +dnl in all copies or substantial portions of the Software. * +dnl * +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * +dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * +dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * +dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * +dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +dnl * +dnl Except as contained in this notice, the name(s) of the above copyright * +dnl holders shall not be used in advertising or otherwise to promote the * +dnl sale, use or other dealings in this Software without prior written * +dnl authorization. * +dnl*************************************************************************** +dnl +dnl Author: Thomas E. Dickey 1996,1997,1998 +dnl +dnl $Id: aclocal.m4,v 1.121 1998/02/11 12:13:40 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl --------------------------------------------------------------------------- +dnl --------------------------------------------------------------------------- dnl Construct the list of include-options for the C programs in the Ada95 dnl binding. -AC_DEFUN([NC_ADA_INCLUDE_DIRS], +AC_DEFUN([CF_ADA_INCLUDE_DIRS], [ ACPPFLAGS="$ACPPFLAGS -I. -I../../include" if test "$srcdir" != "."; then @@ -49,15 +61,15 @@ dnl 2.6.3 does, in anticipation of the ANSI C++ standard. dnl dnl Treat the configuration-variable specially here, since we're directly dnl substituting its value (i.e., 1/0). -AC_DEFUN([NC_BOOL_DECL], +AC_DEFUN([CF_BOOL_DECL], [ AC_MSG_CHECKING([for builtin c++ bool type]) -AC_CACHE_VAL(nc_cv_builtin_bool,[ +AC_CACHE_VAL(cf_cv_builtin_bool,[ AC_TRY_COMPILE([],[bool x = false], - [nc_cv_builtin_bool=1], - [nc_cv_builtin_bool=0]) + [cf_cv_builtin_bool=1], + [cf_cv_builtin_bool=0]) ]) -if test $nc_cv_builtin_bool = 1 +if test $cf_cv_builtin_bool = 1 then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi @@ -65,11 +77,11 @@ fi dnl --------------------------------------------------------------------------- dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). dnl Don't bother looking for bool.h, since it's been deprecated. -AC_DEFUN([NC_BOOL_SIZE], +AC_DEFUN([CF_BOOL_SIZE], [ AC_MSG_CHECKING([for size of c++ bool]) -AC_CACHE_VAL(nc_cv_type_of_bool,[ - rm -f nc_test.out +AC_CACHE_VAL(cf_cv_type_of_bool,[ + rm -f cf_test.out AC_TRY_RUN([ #include #include @@ -78,9 +90,11 @@ AC_CACHE_VAL(nc_cv_type_of_bool,[ #endif main() { - FILE *fp = fopen("nc_test.out", "w"); + FILE *fp = fopen("cf_test.out", "w"); if (fp != 0) { - bool x = false; + bool x = true; + if ((-x) >= 0) + fputs("unsigned ", fp); if (sizeof(x) == sizeof(int)) fputs("int", fp); else if (sizeof(x) == sizeof(char)) fputs("char", fp); else if (sizeof(x) == sizeof(short))fputs("short",fp); @@ -90,15 +104,15 @@ main() exit(0); } ], - [nc_cv_type_of_bool=`cat nc_test.out`], - [nc_cv_type_of_bool=unknown], - [nc_cv_type_of_bool=unknown]) + [cf_cv_type_of_bool=`cat cf_test.out`], + [cf_cv_type_of_bool=unknown], + [cf_cv_type_of_bool=unknown]) ]) - rm -f nc_test.out -AC_MSG_RESULT($nc_cv_type_of_bool) -if test $nc_cv_type_of_bool = unknown ; then + rm -f cf_test.out +AC_MSG_RESULT($cf_cv_type_of_bool) +if test "$cf_cv_type_of_bool" = unknown ; then AC_MSG_WARN(Assuming unsigned for type of bool) - nc_cv_type_of_bool=unsigned + cf_cv_type_of_bool=unsigned fi ])dnl dnl --------------------------------------------------------------------------- @@ -112,22 +126,25 @@ dnl dnl We don't use AC_PREFIX_DEFAULT, because it gets evaluated too soon, and dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's dnl programs from a vendor's. -AC_DEFUN([NC_CFG_DEFAULTS], +AC_DEFUN([CF_CFG_DEFAULTS], [ AC_MSG_CHECKING(for prefix) if test "x$prefix" = "xNONE" ; then - case "$nc_cv_systype" in + case "$cf_cv_system_name" in # non-vendor systems don't have a conflict - NetBSD|FreeBSD|Linux) prefix=/usr + openbsd*|netbsd*|freebsd*|linux*) + prefix=/usr ;; *) prefix=$ac_default_prefix ;; esac fi AC_MSG_RESULT($prefix) + +if test "x$prefix" = "xNONE" ; then AC_MSG_CHECKING(for default include-directory) -test -n "$verbose" && echo 1>&6 -for nc_symbol in \ +test -n "$verbose" && echo 1>&AC_FD_MSG +for cf_symbol in \ $includedir \ $includedir/ncurses \ $prefix/include \ @@ -137,76 +154,161 @@ for nc_symbol in \ /usr/include \ /usr/include/ncurses do - nc_dir=`eval echo $nc_symbol` - if test -f $nc_dir/curses.h ; then - if ( fgrep NCURSES_VERSION $nc_dir/curses.h 2>&1 >/dev/null ) ; then - includedir="$nc_symbol" - test -n "$verbose" && echo $ac_n " found " 1>&6 + cf_dir=`eval echo $cf_symbol` + if test -f $cf_dir/curses.h ; then + if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then + includedir="$cf_symbol" + test -n "$verbose" && echo $ac_n " found " 1>&AC_FD_MSG break fi fi - test -n "$verbose" && echo " tested $nc_dir" 1>&6 + test -n "$verbose" && echo " tested $cf_dir" 1>&AC_FD_MSG done AC_MSG_RESULT($includedir) +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl Check for data that is usually declared in or +dnl $1 = the name to check +AC_DEFUN([CF_CHECK_ERRNO], +[ +AC_MSG_CHECKING([declaration of $1]) +AC_CACHE_VAL(cf_cv_dcl_$1,[ + AC_TRY_COMPILE([ +#include +#include +#include ], + [long x = (long) $1], + [eval 'cf_cv_dcl_'$1'=yes'], + [eval 'cf_cv_dcl_'$1'=no]')]) +eval 'cf_result=$cf_cv_dcl_'$1 +AC_MSG_RESULT($cf_result) + +# It's possible (for near-UNIX clones) that the data doesn't exist +AC_CACHE_VAL(cf_cv_have_$1,[ +if test $cf_result = no ; then + eval 'cf_result=DECL_'$1 + CF_UPPER(cf_result,$cf_result) + AC_DEFINE_UNQUOTED($cf_result) + AC_MSG_CHECKING([existence of $1]) + AC_TRY_LINK([ +#undef $1 +extern long $1; +], + [$1 = 2], + [eval 'cf_cv_have_'$1'=yes'], + [eval 'cf_cv_have_'$1'=no']) + eval 'cf_result=$cf_cv_have_'$1 + AC_MSG_RESULT($cf_result) +else + eval 'cf_cv_have_'$1'=yes' +fi +]) +eval 'cf_result=HAVE_'$1 +CF_UPPER(cf_result,$cf_result) +eval 'test $cf_cv_have_'$1' = yes && AC_DEFINE_UNQUOTED($cf_result)' +])dnl +dnl --------------------------------------------------------------------------- +dnl Check if the terminal-capability database functions are available. If not, +dnl ncurses has a much-reduced version. +AC_DEFUN([CF_CGETENT],[ +AC_MSG_CHECKING(for terminal-capability database functions) +AC_CACHE_VAL(cf_cv_cgetent,[ +AC_TRY_LINK([ +#include ],[ + char temp[128]; + char *buf = temp; + char *db_array = temp; + cgetent(&buf, /* int *, */ &db_array, "vt100"); + cgetcap(buf, "tc", '='); + cgetmatch(buf, "tc"); + ], + [cf_cv_cgetent=yes], + [cf_cv_cgetent=no]) +]) +AC_MSG_RESULT($cf_cv_cgetent) +test $cf_cv_cgetent = yes && AC_DEFINE(HAVE_BSD_CGETENT) +])dnl +dnl --------------------------------------------------------------------------- +dnl Check if we're accidentally using a cache from a different machine. +dnl Derive the system name, as a check for reusing the autoconf cache. +dnl +dnl If we've packaged config.guess and config.sub, run that (since it does a +dnl better job than uname). +AC_DEFUN([CF_CHECK_CACHE], +[ +if test -f $srcdir/config.guess ; then + AC_CANONICAL_HOST + system_name="$host_os" +else + system_name="`(uname -s -r) 2>/dev/null`" + if test -z "$system_name" ; then + system_name="`(hostname) 2>/dev/null`" + fi +fi +test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name") +AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"]) + +test -z "$system_name" && system_name="$cf_cv_system_name" +test -n "$cf_cv_system_name" && AC_MSG_RESULT("Configuring for $cf_cv_system_name") + +if test ".$system_name" != ".$cf_cv_system_name" ; then + AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)) + AC_ERROR("Please remove config.cache and try again.") +fi ])dnl dnl --------------------------------------------------------------------------- dnl If we're trying to use g++, test if libg++ is installed (a rather common dnl problem :-). If we have the compiler but no library, we'll be able to dnl configure, but won't be able to build the c++ demo program. -AC_DEFUN([NC_CXX_LIBRARY], +AC_DEFUN([CF_CXX_LIBRARY], [ -nc_cxx_library=unknown +cf_cxx_library=unknown if test $ac_cv_prog_gxx = yes; then AC_MSG_CHECKING([for libg++]) - nc_save="$LIBS" + cf_save="$LIBS" LIBS="$LIBS -lg++ -lm" AC_TRY_LINK([ #include ], [float foo=abs(1.0)], - [nc_cxx_library=yes + [cf_cxx_library=yes CXXLIBS="$CXXLIBS -lg++ -lm"], - [nc_cxx_library=no]) - LIBS="$nc_save" - AC_MSG_RESULT($nc_cxx_library) + [cf_cxx_library=no]) + LIBS="$cf_save" + AC_MSG_RESULT($cf_cxx_library) fi ])dnl dnl --------------------------------------------------------------------------- -AC_DEFUN([NC_DIRS_TO_MAKE], +AC_DEFUN([CF_DIRS_TO_MAKE], [ DIRS_TO_MAKE="lib" -for nc_item in $nc_list_models +for cf_item in $cf_list_models do - NC_OBJ_SUBDIR($nc_item,nc_subdir) - DIRS_TO_MAKE="$DIRS_TO_MAKE $nc_subdir" + CF_OBJ_SUBDIR($cf_item,cf_subdir) + DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir" done -for nc_dir in $DIRS_TO_MAKE +for cf_dir in $DIRS_TO_MAKE do - test ! -d $nc_dir && mkdir $nc_dir + test ! -d $cf_dir && mkdir $cf_dir done AC_SUBST(DIRS_TO_MAKE) ])dnl dnl --------------------------------------------------------------------------- -dnl -AC_DEFUN([NC_ERRNO], +dnl Check if 'errno' is declared in +AC_DEFUN([CF_ERRNO], [ -AC_MSG_CHECKING([for errno external decl]) -AC_CACHE_VAL(nc_cv_extern_errno,[ - AC_TRY_COMPILE([ -#include ], - [int x = errno], - [nc_cv_extern_errno=yes], - [nc_cv_extern_errno=no]) - ]) -AC_MSG_RESULT($nc_cv_extern_errno) -test $nc_cv_extern_errno = yes && AC_DEFINE(HAVE_EXTERN_ERRNO) +CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary dnl to documentation, unrecognized directives cause older compilers to barf. -AC_DEFUN([NC_GCC_ATTRIBUTES], -[cat > conftest.i < conftest.i <&AC_FD_CC - case $nc_attribute in + CF_UPPER(CF_ATTRIBUTE,$cf_attribute) + cf_directive="__attribute__(($cf_attribute))" + echo "checking for gcc $cf_directive" 1>&AC_FD_CC + case $cf_attribute in scanf|printf) cat >conftest.h <conftest.h <>confdefs.h # else # sed -e 's/__attr.*/\/*nothing*\//' conftest.h >>confdefs.h @@ -273,7 +375,7 @@ else fgrep define conftest.i >>confdefs.h fi rm -rf conftest* - +fi ])dnl dnl --------------------------------------------------------------------------- dnl Check if the compiler supports useful warning options. There's a few that @@ -282,9 +384,11 @@ dnl dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x) dnl -Wredundant-decls (system headers make this too noisy) dnl -Wtraditional (combines too many unrelated messages, only a few useful) +dnl -Wwrite-strings (too noisy, but should review occasionally) +dnl -pedantic dnl -AC_DEFUN([NC_GCC_WARNINGS], -[nc_warn_CFLAGS="" +AC_DEFUN([CF_GCC_WARNINGS], +[ if test -n "$GCC" then changequote(,)dnl @@ -294,11 +398,11 @@ int main(int argc, char *argv[]) { return argv[argc-1] == 0; } EOF changequote([,])dnl AC_CHECKING([for gcc warning options]) - nc_save_CFLAGS="$CFLAGS" - nc_warn_CFLAGS="-W -Wall" - nc_warn_CONST="" - test "$with_ext_const" = yes && nc_warn_CONST="Wwrite-strings" - for nc_opt in \ + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-W -Wall" + cf_warn_CONST="" + test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + for cf_opt in \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ @@ -308,41 +412,55 @@ EOF Wnested-externs \ Wpointer-arith \ Wshadow \ - Wstrict-prototypes $nc_warn_CONST + Wstrict-prototypes $cf_warn_CONST do - CFLAGS="$nc_save_CFLAGS $nc_warn_CFLAGS -$nc_opt" + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" if AC_TRY_EVAL(ac_compile); then - test -n "$verbose" && AC_MSG_RESULT(... -$nc_opt) - nc_warn_CFLAGS="$nc_warn_CFLAGS -$nc_opt" + test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt) + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" fi done rm -f conftest* - CFLAGS="$nc_save_CFLAGS" + CFLAGS="$cf_save_CFLAGS" fi +AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- dnl Verify Version of GNAT. -AC_DEFUN([NC_GNAT_VERSION], +AC_DEFUN([CF_GNAT_VERSION], [ changequote(<<, >>)dnl -nc_cv_gnat_version=`$nc_ada_make -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ +cf_cv_gnat_version=`$cf_ada_make -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ sed -e 's/[^0-9 \.]//g' | $AWK '{print $<<1>>;}'` -case $nc_cv_gnat_version in - 3.0[5-9]|3.[1-9]*|[4-9].*) +case $cf_cv_gnat_version in + 3.[1-9]*|[4-9].*) ac_cv_prog_gnat_correct=yes ;; - *) echo Unsupported GNAT version $nc_cv_gnat_version. Disabling Ada95 binding. + *) echo Unsupported GNAT version $cf_cv_gnat_version. Required is 3.10 or better. Disabling Ada95 binding. ac_cv_prog_gnat_correct=no ;; esac +case $cf_cv_gnat_version in + 3.1*|[4-9].*) + cf_compile_generics=generics + ;; + *) cf_compile_generics= + ;; +esac changequote([, ])dnl ]) dnl --------------------------------------------------------------------------- +dnl Insert text into the help-message, for readability, from AC_ARG_WITH. +AC_DEFUN([CF_HELP_MESSAGE], +[AC_DIVERT_HELP([$1])dnl +])dnl +dnl --------------------------------------------------------------------------- dnl Construct the list of include-options according to whether we're building dnl in the source directory or using '--srcdir=DIR' option. If we're building dnl with gcc, don't append the includedir if it happens to be /usr/include, dnl since that usually breaks gcc's shadow-includes. -AC_DEFUN([NC_INCLUDE_DIRS], +AC_DEFUN([CF_INCLUDE_DIRS], [ CPPFLAGS="$CPPFLAGS -I. -I../include" if test "$srcdir" != "."; then @@ -362,6 +480,19 @@ fi AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl Check if we have either a function or macro for 'isascii()'. +AC_DEFUN([CF_ISASCII], +[ +AC_MSG_CHECKING(for isascii) +AC_CACHE_VAL(cf_cv_have_isascii,[ + AC_TRY_LINK([#include ],[int x = isascii(' ')], + [cf_cv_have_isascii=yes], + [cf_cv_have_isascii=no]) +])dnl +AC_MSG_RESULT($cf_cv_have_isascii) +test $cf_cv_have_isascii = yes && AC_DEFINE(HAVE_ISASCII) +])dnl +dnl --------------------------------------------------------------------------- dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the dnl subdirectory is a library-source directory, modify the LIBRARIES list in @@ -373,114 +504,150 @@ dnl one: dnl lib.so -> dnl lib.so. -> dnl lib.so.. -AC_DEFUN([NC_LIB_RULES], +AC_DEFUN([CF_LIB_RULES], [ -AC_REQUIRE([NC_SYSTYPE]) -AC_REQUIRE([NC_VERSION]) -for nc_dir in $SRC_SUBDIRS +CF_LIB_PREFIX(cf_prefix) +AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) +for cf_dir in $SRC_SUBDIRS do - if test -f $srcdir/$nc_dir/modules; then + if test -f $srcdir/$cf_dir/modules; then - nc_libs_to_make= - for nc_item in $NC_LIST_MODELS + cf_libs_to_make= + for cf_item in $CF_LIST_MODELS do - NC_LIB_SUFFIX($nc_item,nc_suffix) - nc_libs_to_make="$nc_libs_to_make ../lib/lib${nc_dir}${nc_suffix}" + CF_LIB_SUFFIX($cf_item,cf_suffix) + cf_libs_to_make="$cf_libs_to_make ../lib/${cf_prefix}${cf_dir}${cf_suffix}" done - sed -e "s@\@LIBS_TO_MAKE\@@$nc_libs_to_make@" \ - $nc_dir/Makefile >$nc_dir/Makefile.out - mv $nc_dir/Makefile.out $nc_dir/Makefile + if test $cf_dir = ncurses ; then + case "$LIB_SUBSETS" in + termlib+*) #(vi + ;; + *) #(vi + cf_item=`echo $cf_libs_to_make |sed -e s/$LIB_NAME/$TINFO_NAME/g` + cf_libs_to_make="$cf_libs_to_make $cf_item" + ;; + esac + fi + + sed -e "s@\@LIBS_TO_MAKE\@@$cf_libs_to_make@" \ + $cf_dir/Makefile >$cf_dir/Makefile.out + mv $cf_dir/Makefile.out $cf_dir/Makefile $AWK -f $srcdir/mk-0th.awk \ - name=$nc_dir \ - $srcdir/$nc_dir/modules >>$nc_dir/Makefile + name=$cf_dir \ + $srcdir/$cf_dir/modules >>$cf_dir/Makefile - for nc_item in $NC_LIST_MODELS + for cf_item in $CF_LIST_MODELS do - echo 'Appending rules for '$nc_item' model ('$nc_dir')' - NC_UPPERCASE($nc_item,NC_ITEM) - NC_LIB_SUFFIX($nc_item,nc_suffix) - NC_OBJ_SUBDIR($nc_item,nc_subdir) + echo 'Appending rules for '$cf_item' model ('$cf_dir')' + CF_UPPER(CF_ITEM,$cf_item) + CF_LIB_SUFFIX($cf_item,cf_suffix) + CF_OBJ_SUBDIR($cf_item,cf_subdir) # These dependencies really are for development, not # builds, but they are useful in porting, too. - nc_depend="../include/ncurses_cfg.h" + cf_depend="../include/ncurses_cfg.h" if test "$srcdir" = "."; then - nc_reldir="." + cf_reldir="." else - nc_reldir="\$(srcdir)" + cf_reldir="\$(srcdir)" fi - if test -f $srcdir/$nc_dir/$nc_dir.priv.h; then - nc_depend="$nc_depend $nc_reldir/$nc_dir.priv.h" - elif test -f $srcdir/$nc_dir/curses.priv.h; then - nc_depend="$nc_depend $nc_reldir/curses.priv.h" + + if test -f $srcdir/$cf_dir/$cf_dir.priv.h; then + cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h" + elif test -f $srcdir/$cf_dir/curses.priv.h; then + cf_depend="$cf_depend $cf_reldir/curses.priv.h" fi + + for cf_subset in $LIB_SUBSETS + do $AWK -f $srcdir/mk-1st.awk \ - name=$nc_dir \ - MODEL=$NC_ITEM \ - model=$nc_subdir \ - suffix=$nc_suffix \ - DoLinks=$nc_cv_do_symlinks \ - rmSoLocs=$nc_cv_rm_so_locs \ + name=$cf_dir \ + MODEL=$CF_ITEM \ + model=$cf_subdir \ + prefix=$cf_prefix \ + suffix=$cf_suffix \ + subset=$cf_subset \ + DoLinks=$cf_cv_do_symlinks \ + rmSoLocs=$cf_cv_rm_so_locs \ + ldconfig="$LDCONFIG" \ overwrite=$WITH_OVERWRITE \ - depend="$nc_depend" \ - $srcdir/$nc_dir/modules >>$nc_dir/Makefile - test $nc_dir = ncurses && WITH_OVERWRITE=no + depend="$cf_depend" \ + target="$target" \ + $srcdir/$cf_dir/modules >>$cf_dir/Makefile + test $cf_dir = ncurses && WITH_OVERWRITE=no $AWK -f $srcdir/mk-2nd.awk \ - name=$nc_dir \ - MODEL=$NC_ITEM \ - model=$nc_subdir \ + name=$cf_dir \ + MODEL=$CF_ITEM \ + model=$cf_subdir \ + subset=$cf_subset \ srcdir=$srcdir \ echo=$WITH_ECHO \ - $srcdir/$nc_dir/modules >>$nc_dir/Makefile + $srcdir/$cf_dir/modules >>$cf_dir/Makefile + done done fi - echo ' cd '$nc_dir'; $(MAKE) $(NC_MFLAGS) [$]@' >>Makefile + echo ' cd '$cf_dir' && $(MAKE) $(CF_MFLAGS) [$]@' >>Makefile done -for nc_dir in $SRC_SUBDIRS +for cf_dir in $SRC_SUBDIRS do - if test -f $srcdir/$nc_dir/modules; then + if test -f $cf_dir/Makefile ; then + case "$cf_dir" in + Ada95) #(vi + echo 'install.libs \' >> Makefile + echo 'uninstall.libs ::' >> Makefile + echo ' cd '$cf_dir' && $(MAKE) $(CF_MFLAGS) [$]@' >> Makefile + ;; + esac + fi + + if test -f $srcdir/$cf_dir/modules; then echo >> Makefile - if test -f $srcdir/$nc_dir/headers; then -cat >> Makefile <> Makefile <> Makefile fi -cat >> Makefile <> Makefile <> Makefile <> Makefile <> Makefile <> Makefile <headers.sh <headers.sh <>$nc_dir/Makefile <>$cf_dir/Makefile <>$nc_dir/Makefile + test -n "$j" && echo " $j \\" >>$cf_dir/Makefile j=$i done - echo " $j" >>$nc_dir/Makefile - for i in `cat $srcdir/$nc_dir/headers |fgrep -v "#"` + echo " $j" >>$cf_dir/Makefile + for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` + do + echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile + test $i = curses.h && echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile + done + + cat >>$cf_dir/Makefile <>$nc_dir/Makefile + i=`basename $i` + echo " -@ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f $i)" >>$cf_dir/Makefile + test $i = curses.h && echo " -@ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h)" >>$cf_dir/Makefile done fi done +])dnl +dnl --------------------------------------------------------------------------- +dnl Compute the library-prefix for the given host system +dnl $1 = variable to set +AC_DEFUN([CF_LIB_PREFIX], +[ + case $cf_cv_system_name in + os2) $1='' ;; + *) $1='lib' ;; + esac ])dnl dnl --------------------------------------------------------------------------- dnl Compute the library-suffix from the given model name -AC_DEFUN([NC_LIB_SUFFIX], +dnl $1 = model name +dnl $2 = variable to set +AC_DEFUN([CF_LIB_SUFFIX], [ - AC_REQUIRE([NC_SYSTYPE]) - AC_REQUIRE([NC_VERSION]) + AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) case $1 in normal) $2='.a' ;; debug) $2='_g.a' ;; profile) $2='_p.a' ;; shared) - case $nc_cv_systype in - NetBSD|FreeBSD) - $2='.so.$(ABI_VERSION)' ;; - HP_UX) $2='.sl' ;; + case $cf_cv_system_name in + openbsd*|netbsd*|freebsd*) + $2='.so.$(REL_VERSION)' ;; + hpux*) $2='.sl' ;; *) $2='.so' ;; esac esac ])dnl dnl --------------------------------------------------------------------------- dnl Compute the string to append to -library from the given model name -AC_DEFUN([NC_LIB_TYPE], +AC_DEFUN([CF_LIB_TYPE], [ case $1 in normal) $2='' ;; @@ -592,10 +784,10 @@ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have dnl only data (i.e., no functions), for example NeXT. On those systems we'll dnl have to provide wrappers for global tables to ensure they're linked dnl properly. -AC_DEFUN([NC_LINK_DATAONLY], +AC_DEFUN([CF_LINK_DATAONLY], [ AC_MSG_CHECKING([if data-only library module links]) -AC_CACHE_VAL(nc_cv_link_dataonly,[ +AC_CACHE_VAL(cf_cv_link_dataonly,[ rm -f conftest.a changequote(,)dnl cat >conftest.$ac_ext <&5 >/dev/null - nc_saveLIBS="$LIBS" + cf_saveLIBS="$LIBS" LIBS="conftest.a $LIBS" AC_TRY_RUN([ int main() @@ -639,116 +831,113 @@ EOF exit (!testfunc()); } ], - [nc_cv_link_dataonly=yes], - [nc_cv_link_dataonly=no], - [nc_cv_link_dataonly=unknown]) - LIBS="$nc_saveLIBS" + [cf_cv_link_dataonly=yes], + [cf_cv_link_dataonly=no], + [cf_cv_link_dataonly=unknown]) + LIBS="$cf_saveLIBS" ]) -AC_MSG_RESULT($nc_cv_link_dataonly) -test $nc_cv_link_dataonly = no && AC_DEFINE(BROKEN_LINKER) +AC_MSG_RESULT($cf_cv_link_dataonly) +test $cf_cv_link_dataonly = no && AC_DEFINE(BROKEN_LINKER) ])dnl dnl --------------------------------------------------------------------------- dnl Some 'make' programs support $(MAKEFLAGS), some $(MFLAGS), to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. dnl (GNU 'make' does both :-) -AC_DEFUN([NC_MAKEFLAGS], +AC_DEFUN([CF_MAKEFLAGS], [ AC_MSG_CHECKING([for makeflags variable]) -AC_CACHE_VAL(nc_cv_makeflags,[ - nc_cv_makeflags='' - for nc_option in '$(MFLAGS)' '-$(MAKEFLAGS)' +AC_CACHE_VAL(cf_cv_makeflags,[ + cf_cv_makeflags='' + for cf_option in '$(MFLAGS)' '-$(MAKEFLAGS)' do - cat >ncurses.tmp <cf_makeflags.tmp </dev/null` - if test "$nc_result" != "." + echo '.$cf_option' +CF_EOF + set cf_result=`${MAKE-make} -f cf_makeflags.tmp 2>/dev/null` + if test "$cf_result" != "." then - nc_cv_makeflags=$nc_option + cf_cv_makeflags=$cf_option break fi done - rm -f ncurses.tmp - ]) -AC_MSG_RESULT($nc_cv_makeflags) -AC_SUBST(nc_cv_makeflags) + rm -f cf_makeflags.tmp]) +AC_MSG_RESULT($cf_cv_makeflags) +AC_SUBST(cf_cv_makeflags) ])dnl dnl --------------------------------------------------------------------------- dnl Try to determine if the man-pages on the system are compressed, and if dnl so, what format is used. Use this information to construct a script that dnl will install man-pages. -AC_DEFUN([NC_MAN_PAGES], +AC_DEFUN([CF_MAN_PAGES], [AC_MSG_CHECKING(format of man-pages) if test -z "$MANPATH" ; then MANPATH="/usr/man:/usr/share/man" fi # look for the 'date' man-page (it's most likely to be installed!) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - nc_form=unknown - for nc_dir in $MANPATH; do - test -z "$nc_dir" && nc_dir=/usr/man - nc_rename="" - nc_format=no + cf_form=unknown + for cf_dir in $MANPATH; do + test -z "$cf_dir" && cf_dir=/usr/man + cf_rename="" + cf_format=no changequote({{,}})dnl - for nc_name in $nc_dir/*/date.[01]* $nc_dir/*/date + for cf_name in $cf_dir/*/date.[01]* $cf_dir/*/date changequote([,])dnl do - nc_test=`echo $nc_name | sed -e 's/*//'` - if test "x$nc_test" = "x$nc_name" ; then - case "$nc_name" in - *.gz) nc_form=gzip; nc_name=`basename $nc_name .gz`;; - *.Z) nc_form=compress; nc_name=`basename $nc_name .Z`;; - *.0) nc_form=BSDI; nc_format=yes;; - *) nc_form=cat;; + cf_test=`echo $cf_name | sed -e 's/*//'` + if test "x$cf_test" = "x$cf_name" ; then + case "$cf_name" in + *.gz) cf_form=gzip; cf_name=`basename $cf_name .gz`;; + *.Z) cf_form=compress; cf_name=`basename $cf_name .Z`;; + *.0) cf_form=BSDI; cf_format=yes;; + *) cf_form=cat;; esac break fi done - if test "$nc_form" != "unknown" ; then + if test "$cf_form" != "unknown" ; then break fi done IFS="$ac_save_ifs" if test "$prefix" = "NONE" ; then - nc_prefix="$ac_default_prefix" + cf_prefix="$ac_default_prefix" else - nc_prefix="$prefix" + cf_prefix="$prefix" fi # Debian 'man' program? test -f /etc/debian_version && \ - nc_rename=`cd $srcdir;pwd`/man/man_db.renames + cf_rename=`cd $srcdir && pwd`/man/man_db.renames test ! -d man && mkdir man # Construct a sed-script to perform renaming within man-pages - if test -n "$nc_rename" ; then - fgrep -v \# $nc_rename | \ - sed -e 's/^/s\//' \ - -e 's/\./\\./' \ - -e 's/ / /g' \ - -e 's/[ ]\+/\//' \ - -e s/\$/\\\/g/ >man/edit_man.sed + if test -n "$cf_rename" ; then + $srcdir/man/make_sed.sh $cf_rename >man/edit_man.sed fi - if test $nc_format = yes ; then - nc_subdir='$mandir/cat' + if test $cf_format = yes ; then + cf_subdir='$mandir/cat' else - nc_subdir='$mandir/man' + cf_subdir='$mandir/man' fi -cat >man/edit_man.sh <man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <\$TMP -NC_EOF +CF_EOF else -cat >>man/edit_man.sh <>man/edit_man.sh <\$TMP -NC_EOF + target="$cf_subdir\$section/\$target" + test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed -f edit_man.sed >\$TMP +CF_EOF fi -if test $nc_format = yes ; then -cat >>man/edit_man.sh <>man/edit_man.sh <\$TMP.out mv \$TMP.out \$TMP -NC_EOF +CF_EOF +fi fi -case "$nc_form" in +case "$cf_form" in compress) -cat >>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh <>man/edit_man.sh </dev/null ) +then + echo "$2 is unchanged" + rm -f $1 +else + echo "creating $2" + rm -f $2 + mv $1 $2 +fi +])dnl +dnl --------------------------------------------------------------------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script -AC_DEFUN([NC_PROG_INSTALL], +AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL case $INSTALL in /*) ;; *) changequote({{,}})dnl - nc_dir=`echo $INSTALL|sed -e 's%/[^/]*$%%'` - test -z "$nc_dir" && nc_dir=. + cf_dir=`echo $INSTALL|sed -e 's%/[^/]*$%%'` + test -z "$cf_dir" && cf_dir=. changequote([,])dnl - INSTALL=`cd $nc_dir;pwd`/`echo $INSTALL | sed -e 's:^.*/::'` + INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's:^.*/::'` ;; esac ])dnl dnl --------------------------------------------------------------------------- dnl Attempt to determine if we've got one of the flavors of regular-expression dnl code that we can support. -AC_DEFUN([NC_REGEX], +AC_DEFUN([CF_REGEX], [ AC_MSG_CHECKING([for regular-expression headers]) -AC_CACHE_VAL(nc_cv_regex,[ +AC_CACHE_VAL(cf_cv_regex,[ AC_TRY_LINK([#include #include ],[ regex_t *p; int x = regcomp(p, "", 0); int y = regexec(p, "", 0, 0, 0); regfree(p); - ],[nc_cv_regex="regex.h"],[ + ],[cf_cv_regex="regex.h"],[ AC_TRY_LINK([#include ],[ char *p = compile("", "", "", 0); int x = step("", ""); - ],[nc_cv_regex="regexp.h"],[ + ],[cf_cv_regex="regexp.h"],[ + cf_save_LIBS="$LIBS" + LIBS="-lgen $LIBS" AC_TRY_LINK([#include ],[ char *p = compile("", "", ""); int x = step("", ""); - ],[nc_cv_regex="regexpr.h"])])]) + ],[cf_cv_regex="regexpr.h"],[LIBS="$cf_save_LIBS"])])]) ]) -AC_MSG_RESULT($nc_cv_regex) -case $nc_cv_regex in - regex.h) AC_DEFINE(HAVE_REGEX_H) ;; - regexp.h) AC_DEFINE(HAVE_REGEXP_H) ;; - regexpr.h) AC_DEFINE(HAVE_REGEXPR_H) ;; +AC_MSG_RESULT($cf_cv_regex) +case $cf_cv_regex in + regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS) ;; + regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;; + regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;; esac ])dnl dnl --------------------------------------------------------------------------- +dnl This bypasses the normal autoconf process because we're generating an +dnl arbitrary number of NEED_xxxx definitions with the CF_HAVE_FUNCS macro. +dnl Rather than populate an aclocal.h file with all of those definitions, we do +dnl it here. +dnl +dnl Parameters: +dnl $1 = input, which configure has done substitutions upon (will delete) +dnl $2 = target file +dnl $3 = preamble, if any (a 'here' document) +dnl $4 = trailer, if any (a 'here' document) +dnl +AC_DEFUN([CF_SED_CONFIG_H],[ +cf_config_h=conf$$ +rm -f $cf_config_h +## PREAMBLE +ifelse($3,,[ +echo '/* generated by configure-script */' >$cf_config_h +],[cat >$cf_config_h <$cf_config_h + $ac_cv_path_TD_CONFIG $1 |egrep '^#' | sort >>$cf_config_h +else +grep -v '^ -D' $1 >>$cf_config_h +changequote(,)dnl +sed -e '/^ -D/!d' \ + -e '/^# /d' \ + -e 's/ -D/\ +#define /g' \ + -e 's/\(#define [A-Za-z_][A-Za-z0-9_]*\)=/\1 /g' \ + -e 's@\\@@g' \ + $1 | sort >>$cf_config_h +changequote([,])dnl +fi +## TRAILER +ifelse($4,,, +[cat >>$cf_config_h < +#if HAVE_TERMIOS_H +#include +#else +#if HAVE_TERMIO_H +#include +#endif +#endif +#if NEED_PTEM_H +/* This is a workaround for SCO: they neglected to define struct winsize in + * termios.h -- it's only in termio.h and ptem.h + */ +#include +#include +#endif +#if !defined(sun) || !defined(HAVE_TERMIOS_H) +#include +#endif +],[ +#ifdef TIOCGSIZE + struct ttysize win; /* FIXME: what system is this? */ + int y = win.ts_lines; + int x = win.ts_cols; +#else +#ifdef TIOCGWINSZ + struct winsize win; + int y = win.ws_row; + int x = win.ws_col; +#else + no TIOCGSIZE or TIOCGWINSZ +#endif /* TIOCGWINSZ */ +#endif /* TIOCGSIZE */ + ], + [cf_cv_sizechange=yes], + [cf_cv_sizechange=no]) + + CFLAGS="$cf_save_CFLAGS" + if test "$cf_cv_sizechange" = yes ; then + echo "size-change succeeded ($cf_opts)" >&AC_FD_CC + test -n "$cf_opts" && AC_DEFINE_UNQUOTED($cf_opts) + break + fi +done + ]) +AC_MSG_RESULT($cf_cv_sizechange) +test $cf_cv_sizechange != no && AC_DEFINE(HAVE_SIZECHANGE) ])dnl dnl --------------------------------------------------------------------------- dnl Check for datatype 'speed_t', which is normally declared via either dnl sys/types.h or termios.h -AC_DEFUN([NC_SPEED_TYPE], +AC_DEFUN([CF_SPEED_TYPE], [ AC_MSG_CHECKING([for speed_t]) -AC_CACHE_VAL(nc_cv_type_speed_t,[ +AC_CACHE_VAL(cf_cv_type_speed_t,[ AC_TRY_COMPILE([ #include #if HAVE_TERMIOS_H #include #endif], [speed_t x = 0], - [nc_cv_type_speed_t=yes], - [nc_cv_type_speed_t=no]) + [cf_cv_type_speed_t=yes], + [cf_cv_type_speed_t=no]) ]) -AC_MSG_RESULT($nc_cv_type_speed_t) -test $nc_cv_type_speed_t != yes && AC_DEFINE(speed_t,unsigned) +AC_MSG_RESULT($cf_cv_type_speed_t) +test $cf_cv_type_speed_t != yes && AC_DEFINE(speed_t,unsigned) ])dnl dnl --------------------------------------------------------------------------- dnl For each parameter, test if the source-directory exists, and if it contains -dnl a 'modules' file. If so, add to the list $nc_cv_src_modules which we'll -dnl use in NC_LIB_RULES. +dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll +dnl use in CF_LIB_RULES. dnl dnl This uses the configured value to make the lists SRC_SUBDIRS and dnl SUB_MAKEFILES which are used in the makefile-generation scheme. -AC_DEFUN([NC_SRC_MODULES], +AC_DEFUN([CF_SRC_MODULES], [ AC_MSG_CHECKING(for src modules) -TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX}" -TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" -nc_cv_src_modules= -for nc_dir in $1 + +# dependencies and linker-arguments for test-programs +TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS" +TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" + +# dependencies and linker-arguments for utility-programs +PROG_ARGS="$TEST_ARGS" + +cf_cv_src_modules= +for cf_dir in $1 do - if test -f $srcdir/$nc_dir/modules; then - if test -z "$nc_cv_src_modules"; then - nc_cv_src_modules=$nc_dir + if test -f $srcdir/$cf_dir/modules; then + + # We may/may not have tack in the distribution, though the + # makefile is. + if test $cf_dir = tack ; then + if test ! -f $srcdir/${cf_dir}/${cf_dir}.h; then + continue + fi + fi + + if test -z "$cf_cv_src_modules"; then + cf_cv_src_modules=$cf_dir else - nc_cv_src_modules="$nc_cv_src_modules $nc_dir" + cf_cv_src_modules="$cf_cv_src_modules $cf_dir" fi + # Make the ncurses_cfg.h file record the library interface files as # well. These are header files that are the same name as their # directory. Ncurses is the only library that does not follow # that pattern. - if test -f $srcdir/${nc_dir}/${nc_dir}.h; then - NC_UPPERCASE($nc_dir,nc_have_include) - AC_DEFINE_UNQUOTED(HAVE_${nc_have_include}_H) - AC_DEFINE_UNQUOTED(HAVE_LIB${nc_have_include}) - TEST_DEPS="${LIB_PREFIX}${nc_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" - TEST_ARGS="-l${nc_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + if test $cf_dir = tack ; then + continue + elif test -f $srcdir/${cf_dir}/${cf_dir}.h; then + CF_UPPER(cf_have_include,$cf_dir) + AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H) + AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include}) + TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" + TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" fi fi done -AC_MSG_RESULT($nc_cv_src_modules) -TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +AC_MSG_RESULT($cf_cv_src_modules) +TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS" AC_SUBST(TEST_DEPS) AC_SUBST(TEST_ARGS) +PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS" +AC_SUBST(PROG_ARGS) + SRC_SUBDIRS="man include" -for nc_dir in $nc_cv_src_modules +for cf_dir in $cf_cv_src_modules do - SRC_SUBDIRS="$SRC_SUBDIRS $nc_dir" + SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" done SRC_SUBDIRS="$SRC_SUBDIRS misc test" -test $nc_cxx_library != no && SRC_SUBDIRS="$SRC_SUBDIRS c++" +test $cf_cxx_library != no && SRC_SUBDIRS="$SRC_SUBDIRS c++" ADA_SUBDIRS= if test "$ac_cv_prog_gnat_correct" = yes && test -d $srcdir/Ada95; then @@ -1058,162 +1442,323 @@ if test "$ac_cv_prog_gnat_correct" = yes && test -d $srcdir/Ada95; then fi SUB_MAKEFILES= -for nc_dir in $SRC_SUBDIRS +for cf_dir in $SRC_SUBDIRS do - SUB_MAKEFILES="$SUB_MAKEFILES $nc_dir/Makefile" + SUB_MAKEFILES="$SUB_MAKEFILES $cf_dir/Makefile" done if test -n "$ADA_SUBDIRS"; then - for nc_dir in $ADA_SUBDIRS + for cf_dir in $ADA_SUBDIRS do - SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$nc_dir/Makefile" + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile" done AC_SUBST(ADA_SUBDIRS) fi ])dnl dnl --------------------------------------------------------------------------- dnl Remove "-g" option from the compiler options -AC_DEFUN([NC_STRIP_G_OPT], +AC_DEFUN([CF_STRIP_G_OPT], [$1=`echo ${$1} | sed -e 's/-g //' -e 's/-g$//'`])dnl dnl --------------------------------------------------------------------------- +dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only +dnl do this if we've found the sigaction function. +dnl +dnl If needed, define SVR4_ACTION. +AC_DEFUN([CF_STRUCT_SIGACTION],[ +if test $ac_cv_func_sigaction = yes; then +AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE) +AC_TRY_COMPILE([ +#include +#include ], + [struct sigaction act], + [sigact_bad=no], + [ +AC_TRY_COMPILE([ +#define _POSIX_SOURCE +#include +#include ], + [struct sigaction act], + [sigact_bad=yes + AC_DEFINE(SVR4_ACTION)], + [sigact_bad=unknown])]) +AC_MSG_RESULT($sigact_bad) +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl Some machines require _POSIX_SOURCE to completely define struct termios. +dnl If so, define SVR4_TERMIO +AC_DEFUN([CF_STRUCT_TERMIOS],[ +if test $ac_cv_header_termios_h = yes ; then + case "$CFLAGS" in + *-D_POSIX_SOURCE*) + termios_bad=dunno ;; + *) termios_bad=maybe ;; + esac + if test $termios_bad = maybe ; then + AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE) + AC_TRY_COMPILE([#include ], + [struct termios foo; int x = foo.c_iflag], + termios_bad=no, [ + AC_TRY_COMPILE([ +#define _POSIX_SOURCE +#include ], + [struct termios foo; int x = foo.c_iflag], + termios_bad=unknown, + termios_bad=yes AC_DEFINE(SVR4_TERMIO)) + ]) + AC_MSG_RESULT($termios_bad) + fi +fi +])dnl +dnl --------------------------------------------------------------------------- dnl Shorthand macro for substituting things that the user may override dnl with an environment variable. dnl dnl $1 = long/descriptive name dnl $2 = environment variable dnl $3 = default value -AC_DEFUN([NC_SUBST], -[AC_CACHE_VAL(nc_cv_subst_$2,[ +AC_DEFUN([CF_SUBST], +[AC_CACHE_VAL(cf_cv_subst_$2,[ AC_MSG_CHECKING(for $1 (symbol $2)) test -z "[$]$2" && $2=$3 AC_MSG_RESULT([$]$2) AC_SUBST($2) -nc_cv_subst_$2=[$]$2]) -$2=${nc_cv_subst_$2} +cf_cv_subst_$2=[$]$2]) +$2=${cf_cv_subst_$2} ])dnl dnl --------------------------------------------------------------------------- -dnl Check for declarion of sys_errlist in one of stdio.h and errno.h. -dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. -dnl Reported by Keith Bostic. -AC_DEFUN([NC_SYS_ERRLIST], -[ -AC_MSG_CHECKING([declaration of sys_errlist]) -AC_CACHE_VAL(nc_cv_dcl_sys_errlist,[ - AC_TRY_COMPILE([ -#include -#include -#include ], - [ char *c = (char *) *sys_errlist; ], - [nc_cv_dcl_sys_errlist=yes], - [nc_cv_dcl_sys_errlist=no]) - ]) -AC_MSG_RESULT($nc_cv_dcl_sys_errlist) -test $nc_cv_dcl_sys_errlist = yes && AC_DEFINE(HAVE_EXTERN_SYS_ERRLIST) -])dnl -dnl --------------------------------------------------------------------------- -dnl Derive the system-type (our main clue to the method of building shared -dnl libraries). -AC_DEFUN([NC_SYSTYPE], +dnl Get the version-number for use in shared-library naming, etc. +AC_DEFUN([CF_SUBST_NCURSES_VERSION], [ -AC_CACHE_VAL(nc_cv_systype,[ changequote(,)dnl -nc_cv_systype="`(uname -s || hostname || echo unknown) 2>/dev/null |sed -e s'/[:\/.-]/_/'g | sed 1q`" +NCURSES_MAJOR="`egrep '^NCURSES_MAJOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" +NCURSES_MINOR="`egrep '^NCURSES_MINOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" +NCURSES_PATCH="`egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" changequote([,])dnl -if test -z "$nc_cv_systype"; then nc_cv_systype=unknown;fi -]) -AC_MSG_RESULT(System type is $nc_cv_systype) +cf_cv_abi_version=${NCURSES_MAJOR} +cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} +dnl Show the computed version, for logging +AC_MSG_RESULT(Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version (`date`)) +dnl We need these values in the generated headers +AC_SUBST(NCURSES_MAJOR) +AC_SUBST(NCURSES_MINOR) +AC_SUBST(NCURSES_PATCH) +dnl We need these values in the generated makefiles +AC_SUBST(cf_cv_rel_version) +AC_SUBST(cf_cv_abi_version) +AC_SUBST(cf_cv_builtin_bool) +AC_SUBST(cf_cv_type_of_bool) ])dnl dnl --------------------------------------------------------------------------- -dnl On some systems ioctl(fd, TIOCGWINSZ, &size) will always return {0,0} until -dnl ioctl(fd, TIOCSWINSZ, &size) is called to explicitly set the size of the -dnl screen. -dnl -dnl Attempt to determine if we're on such a system by running a test-program. -dnl This won't work, of course, if the configure script is run in batch mode, -dnl since we've got to have access to the terminal. -dnl -dnl 1996/4/26 - Converted this into a simple test for able-to-compile, since -dnl we're reminded that _nc_get_screensize() does the same functional test. -AC_DEFUN([NC_TIOCGWINSZ], +dnl Check if we can include with ; this breaks on +dnl older SCO configurations. +AC_DEFUN([CF_SYS_TIME_SELECT], [ -AC_MSG_CHECKING([for working TIOCGWINSZ]) -AC_CACHE_VAL(nc_cv_use_tiocgwinsz,[ - AC_TRY_RUN([ -#if HAVE_TERMIOS_H -#include +AC_MSG_CHECKING(if sys/time.h works with sys/select.h) +AC_CACHE_VAL(cf_cv_sys_time_select,[ +AC_TRY_COMPILE([ +#include +#if HAVE_SYS_TIME_H +#include #endif -#if SYSTEM_LOOKS_LIKE_SCO -/* they neglected to define struct winsize in termios.h -- it's only - in termio.h */ -#include -#include +#if HAVE_SYS_SELECT_H +#include #endif -#if !defined(sun) || !defined(HAVE_TERMIOS_H) -#include +],[],[cf_cv_sys_time_select=yes], + [cf_cv_sys_time_select=no]) + ]) +AC_MSG_RESULT($cf_cv_sys_time_select) +test $cf_cv_sys_time_select = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT) +])dnl +dnl --------------------------------------------------------------------------- +dnl Determine the type we should use for chtype (and attr_t, which is treated +dnl as the same thing). We want around 32 bits, so on most machines want a +dnl long, but on newer 64-bit machines, probably want an int. If we're using +dnl wide characters, we have to have a type compatible with that, as well. +AC_DEFUN([CF_TYPEOF_CHTYPE], +[ +AC_REQUIRE([CF_UNSIGNED_LITERALS]) +AC_MSG_CHECKING([for type of chtype]) +AC_CACHE_VAL(cf_cv_typeof_chtype,[ + AC_TRY_RUN([ +#if USE_WIDEC_SUPPORT +#include /* we want wchar_t */ +#define WANT_BITS 39 +#else +#define WANT_BITS 31 #endif +#include int main() { - static struct winsize size; - int fd; - for (fd = 0; fd <= 2; fd++) { /* try in/out/err in case redirected */ - if (ioctl(0, TIOCGWINSZ, &size) == 0 - && size.ws_row > 0 - && size.ws_col > 0) - exit(0); + FILE *fp = fopen("cf_test.out", "w"); + if (fp != 0) { + char *result = "long"; +#if USE_WIDEC_SUPPORT + /* + * If wchar_t is smaller than a long, it must be an int or a + * short. We prefer not to use a short anyway. + */ + if (sizeof(unsigned long) > sizeof(wchar_t)) + result = "int"; +#endif + if (sizeof(unsigned long) > sizeof(unsigned int)) { + int n; + unsigned int x; + for (n = 0; n < WANT_BITS; n++) { + unsigned int y = (x >> n); + if (y != 1 || x == 0) { + x = 0; + break; + } + } + /* + * If x is nonzero, an int is big enough for the bits + * that we want. + */ + result = (x != 0) ? "int" : "long"; + } + fputs(result, fp); + fclose(fp); } - exit(0); /* in either case, it compiles & links ... */ + exit(0); } ], - [nc_cv_use_tiocgwinsz=yes], - [nc_cv_use_tiocgwinsz=no], - [nc_cv_use_tiocgwinsz=unknown]) + [cf_cv_typeof_chtype=`cat cf_test.out`], + [cf_cv_typeof_chtype=long], + [cf_cv_typeof_chtype=long]) + rm -f cf_test.out ]) -AC_MSG_RESULT($nc_cv_use_tiocgwinsz) -test $nc_cv_use_tiocgwinsz != yes && AC_DEFINE(BROKEN_TIOCGWINSZ) +AC_MSG_RESULT($cf_cv_typeof_chtype) + +AC_SUBST(cf_cv_typeof_chtype) +AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype) + +cf_cv_1UL="1" +test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U" +test "$cf_cv_typeof_chtype" = long && cf_cv_1UL="${cf_cv_1UL}L" +AC_SUBST(cf_cv_1UL) + ])dnl dnl --------------------------------------------------------------------------- dnl -AC_DEFUN([NC_TYPE_SIGACTION], +AC_DEFUN([CF_TYPE_SIGACTION], [ AC_MSG_CHECKING([for type sigaction_t]) -AC_CACHE_VAL(nc_cv_type_sigaction,[ +AC_CACHE_VAL(cf_cv_type_sigaction,[ AC_TRY_COMPILE([ #include ], [sigaction_t x], - [nc_cv_type_sigaction=yes], - [nc_cv_type_sigaction=no]) + [cf_cv_type_sigaction=yes], + [cf_cv_type_sigaction=no])]) +AC_MSG_RESULT($cf_cv_type_sigaction) +test $cf_cv_type_sigaction = yes && AC_DEFINE(HAVE_TYPE_SIGACTION) +])dnl +dnl --------------------------------------------------------------------------- +dnl Test if the compiler supports 'U' and 'L' suffixes. Only old compilers +dnl won't, but they're still there. +AC_DEFUN([CF_UNSIGNED_LITERALS], +[ +AC_MSG_CHECKING([if unsigned literals are legal]) +AC_CACHE_VAL(cf_cv_unsigned_literals,[ + AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1], + [cf_cv_unsigned_literals=yes], + [cf_cv_unsigned_literals=no]) ]) -AC_MSG_RESULT($nc_cv_type_sigaction) -test $nc_cv_type_sigaction = yes && AC_DEFINE(HAVE_TYPE_SIGACTION) -]) +AC_MSG_RESULT($cf_cv_unsigned_literals) +])dnl dnl --------------------------------------------------------------------------- -dnl Make an uppercase version of a given name -AC_DEFUN([NC_UPPERCASE], +dnl Make an uppercase version of a variable +dnl $1=uppercase($2) +AC_DEFUN([CF_UPPER], [ changequote(,)dnl -$2=`echo $1 |tr '[a-z]' '[A-Z]'` +$1=`echo $2 | tr '[a-z]' '[A-Z]'` changequote([,])dnl ])dnl dnl --------------------------------------------------------------------------- -dnl Get the version-number for use in shared-library naming, etc. -AC_DEFUN([NC_VERSION], +dnl Compute the shift-mask that we'll use for wide-character indices. We use +dnl all but the index portion of chtype for storing attributes. +AC_DEFUN([CF_WIDEC_SHIFT], [ -changequote(,)dnl -NCURSES_MAJOR="`egrep '^NCURSES_MAJOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" -NCURSES_MINOR="`egrep '^NCURSES_MINOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" -NCURSES_PATCH="`egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`" -changequote([,])dnl -nc_cv_abi_version=${NCURSES_MAJOR} -nc_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} -dnl Show the computed version, for logging -AC_MSG_RESULT(Configuring NCURSES $nc_cv_rel_version ABI $nc_cv_abi_version (`date`)) -dnl We need these values in the generated headers -AC_SUBST(NCURSES_MAJOR) -AC_SUBST(NCURSES_MINOR) -AC_SUBST(NCURSES_PATCH) -dnl We need these values in the generated makefiles -AC_SUBST(nc_cv_rel_version) -AC_SUBST(nc_cv_abi_version) -AC_SUBST(nc_cv_builtin_bool) -AC_SUBST(nc_cv_type_of_bool) +AC_REQUIRE([CF_TYPEOF_CHTYPE]) +AC_MSG_CHECKING([for number of bits in chtype]) +AC_CACHE_VAL(cf_cv_shift_limit,[ + AC_TRY_RUN([ +#include +int main() +{ + FILE *fp = fopen("cf_test.out", "w"); + if (fp != 0) { + int n; + unsigned TYPEOF_CHTYPE x = 1L; + for (n = 0; ; n++) { + unsigned long y = (x >> n); + if (y != 1 || x == 0) + break; + x <<= 1; + } + fprintf(fp, "%d", n); + fclose(fp); + } + exit(0); +} + ], + [cf_cv_shift_limit=`cat cf_test.out`], + [cf_cv_shift_limit=32], + [cf_cv_shift_limit=32]) + rm -f cf_test.out + ]) +AC_MSG_RESULT($cf_cv_shift_limit) +AC_SUBST(cf_cv_shift_limit) + +AC_MSG_CHECKING([for width of character-index]) +AC_CACHE_VAL(cf_cv_widec_shift,[ +if test ".$with_widec" = ".yes" ; then + cf_attrs_width=39 + if ( expr $cf_cv_shift_limit \> $cf_attrs_width >/dev/null ) + then + cf_cv_widec_shift=`expr 16 + $cf_cv_shift_limit - $cf_attrs_width` + else + cf_cv_widec_shift=16 + fi +else + cf_cv_widec_shift=8 +fi +]) +AC_MSG_RESULT($cf_cv_widec_shift) +AC_SUBST(cf_cv_widec_shift) +])dnl +dnl --------------------------------------------------------------------------- +dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +dnl defaulting to yes/no. +dnl +dnl $1 = option name +dnl $2 = help-text +dnl $3 = environment variable to set +dnl $4 = default value, shown in the help-message, must be a constant +dnl $5 = default value, if it's an expression & cannot be in the help-message +dnl +AC_DEFUN([CF_WITH_PATH], +[AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, +ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl +case ".$withval" in #(vi +./*) #(vi + ;; +.\[$]{*prefix}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) + withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@` + ;; + esac + ;; #(vi +.NONE/*) + withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@` + ;; +*) + AC_ERROR(expected a pathname for $1) + ;; +esac +eval $3="$withval" +AC_SUBST($3)dnl ])dnl