X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=a1044ba72e16314dbb0c948ec4d42c85b9b9a6da;hp=2a549044ab90db959446afe043f9d8e77547f7ca;hb=a0bb9c404174926bf131a5989a0524a6eecd09eb;hpb=a108bc76f220a81a223a5c25f59195af60452128

diff --git a/test/configure.in b/test/configure.in
index 2a549044..a1044ba7 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2012,2013 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,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996, etc.
 dnl
-dnl $Id: configure.in,v 1.103 2012/01/21 23:55:49 tom Exp $
+dnl $Id: configure.in,v 1.112 2013/05/18 21:53:54 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -38,7 +38,7 @@ dnl It's only for testing purposes.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl ---------------------------------------------------------------------------
-AC_PREREQ(2.13.20020210)
+AC_PREREQ(2.52.20030208)
 AC_INIT(ncurses.c)
 AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin)
 
@@ -49,14 +49,14 @@ CF_CHECK_CACHE
 AC_ARG_PROGRAM
 
 AC_PROG_MAKE_SET
-AC_PROG_CC
+CF_PROG_CC
 AC_PROG_CPP
 AC_PROG_AWK
 CF_PROG_INSTALL
 CF_PROG_LINT
 CF_MAKE_TAGS
 
-CF_MATH_LIB(MATH_LIB,sin(x))
+CF_MATH_LIB(MATH_LIB,pow(sin(x),x))
 AC_SUBST(MATH_LIB)
 
 dnl Things that we don't need (or must override) if we're not building ncurses
@@ -93,28 +93,29 @@ cf_cv_libtype=
 AC_EXEEXT
 AC_OBJEXT
 
-CF_ANSI_CC_REQD
 CF_GCC_ATTRIBUTES
 CF_XOPEN_SOURCE
-AC_C_CONST
 CF_SIG_ATOMIC_T
 
+dnl ---------------------------------------------------------------------------
+CF_HELP_MESSAGE(General Options:)
+CF_PKG_CONFIG
 CF_DISABLE_ECHO
-CF_ENABLE_WARNINGS
-
-CF_DISABLE_LEAKS
 
 dnl ---------------------------------------------------------------------------
+CF_HELP_MESSAGE(Curses Version-dependent Options:)
+CF_NCURSES_WRAP_PREFIX
+
 AC_MSG_CHECKING(if you want to check for wide-character functions)
 CF_ARG_DISABLE(widec,
-	[  --disable-widec           disable checks for wide-character functions],
+	[  --disable-widec         disable checks for wide-character functions],
 	cf_enable_widec=no,
 	cf_enable_widec=yes,
 	yes)
 AC_MSG_RESULT($cf_enable_widec)
 
-
 dnl ---------------------------------------------------------------------------
+CF_HELP_MESSAGE(Curses Version-dependent Options:)
 CF_WITH_NCURSES_ETC
 
 case $cf_cv_screen in
@@ -137,9 +138,12 @@ pdcurses) #(vi
 	;;
 *)
 	# look for curses-related libraries
-	AC_CHECK_LIB(panel$cf_cv_libtype,new_panel)
-	AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver)
-	AC_CHECK_LIB(form$cf_cv_libtype,form_driver)
+	: ${cf_panel_lib:=panel}
+	: ${cf_menu_lib:=menu}
+	: ${cf_form_lib:=form}
+	AC_CHECK_LIB($cf_panel_lib$cf_cv_libtype,new_panel)
+	AC_CHECK_LIB($cf_menu_lib$cf_cv_libtype,menu_driver)
+	AC_CHECK_LIB($cf_form_lib$cf_cv_libtype,form_driver)
 
 	# look for curses-related headers
 	AC_CHECK_HEADERS( \
@@ -153,8 +157,6 @@ pdcurses) #(vi
 	;;
 esac
 
-AC_TYPE_SIGNAL
-
 AC_STDC_HEADERS
 AC_HEADER_TIME
 AC_CHECK_HEADERS( \
@@ -173,7 +175,6 @@ CF_GETOPT_HEADER
 
 AC_CHECK_FUNCS( \
 gettimeofday \
-strdup \
 )
 
 if test "$cf_enable_widec" = yes; then
@@ -269,7 +270,7 @@ then
 		[cf_cv_widechar_funcs=no])
 	])
 	if test "$cf_cv_widechar_funcs" != no ; then
-		AC_DEFINE(USE_WIDEC_SUPPORT,1)
+		AC_DEFINE(USE_WIDEC_SUPPORT,1,[Define to 1 to enable wide-character support in (n)curses])
 	else
 		AC_DEFINE(USE_WIDEC_SUPPORT,0)
 	fi
@@ -279,8 +280,8 @@ fi
 
 CF_SYS_TIME_SELECT
 CF_FUNC_CURSES_VERSION
-CF_CURSES_ACS_MAP
 
+CF_CURSES_ACS_MAP
 if test "$cf_enable_widec" = yes; then
 	CF_CURSES_WACS_MAP
 	CF_CURSES_WACS_SYMBOLS
@@ -309,6 +310,10 @@ fi
 CF_CURSES_CHECK_DATA(boolnames)
 CF_CURSES_CHECK_DATA(boolfnames)
 
+dnl ---------------------------------------------------------------------------
+CF_HELP_MESSAGE(Testing/development Options:)
+CF_ENABLE_WARNINGS
+CF_DISABLE_LEAKS
 CF_DISABLE_RPATH_HACK
 
 TEST_ARGS="$LIBS"
@@ -333,7 +338,8 @@ do
 \$(MODEL)/$N.o : \$(srcdir)/$N.c \\
 	\$(srcdir)/test.priv.h \\
 	ncurses_cfg.h
-	@echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
+	$SHOW_CC
+	$ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c
 TEST_EOF
 done
 
@@ -348,5 +354,7 @@ TEST_EOF
 fi
 ],[
 AWK="$AWK"
+ECHO_CC="$ECHO_CC"
 ECHO_LD="$ECHO_LD"
+SHOW_CC="$SHOW_LD"
 ],cat)