# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- ncurses-5.3/./configure.in~configure +++ ncurses-5.3/./configure.in @@ -34,9 +34,10 @@ dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- -AC_PREREQ(2.13.20020210) +AC_PREREQ(2.57) AC_REVISION($Revision: 1.297 $) -AC_INIT(ncurses/base/lib_initscr.c) +AC_INIT +AC_CONFIG_SRCDIR([ncurses/base/lib_initscr.c]) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) CF_SUBST_NCURSES_VERSION @@ -45,7 +46,7 @@ [AC_MSG_WARN(overriding ABI version to $withval) cf_cv_abi_version=$withval]) -CF_CHECK_CACHE([AC_CANONICAL_SYSTEM]) +CF_CHECK_CACHE([AC_CANONICAL_TARGET([])]) AC_ARG_WITH(system-type, [ --with-system-type=XXX test: override derived host system-type], [AC_MSG_WARN(overriding system type to $withval) @@ -110,7 +111,7 @@ CF_GXX_VERSION case $GXX_VERSION in 1*|2.[[0-6]]*) - GXX=""; CXX=""; ac_cv_prog_gxx=no + GXX=""; CXX=""; ac_cv_cxx_compiler_gnu=no cf_cxx_library=no AC_MSG_WARN(templates do not work) ;; @@ -370,7 +371,7 @@ if test "$CC_SHARED_OPTS" = "unknown"; then for model in $cf_list_models; do if test "$model" = "shared"; then - AC_ERROR(Shared libraries are not supported in this version) + AC_MSG_ERROR([Shared libraries are not supported in this version]) fi done fi @@ -457,7 +458,7 @@ AC_ARG_ENABLE(big-core, [ --disable-big-core assume machine has little memory], [with_big_core=$enableval], - [AC_TRY_RUN([ + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include int main() { @@ -466,10 +467,7 @@ if (s != 0) s[0] = s[n-1] = 0; exit(s == 0); -}], - [with_big_core=yes], - [with_big_core=no], - [with_big_core=no])]) +}]])],[with_big_core=yes],[with_big_core=no],[with_big_core=no])]) AC_MSG_RESULT($with_big_core) test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE) @@ -484,7 +482,7 @@ if test "$with_termcap" != "yes" ; then if test "$use_database" = no ; then if test -z "$with_fallback" ; then - AC_ERROR(You have disabled the database w/o specifying fallbacks) + AC_MSG_ERROR([You have disabled the database w/o specifying fallbacks]) fi fi AC_DEFINE(PURE_TERMINFO) @@ -903,7 +901,7 @@ AC_SUBST(MATH_LIB) ### Checks for header files. -AC_STDC_HEADERS +AC_HEADER_STDC([]) AC_HEADER_DIRENT AC_HEADER_TIME CF_REGEX @@ -937,7 +935,7 @@ CF_SYS_TIME_SELECT ### checks for compiler characteristics -AC_LANG_C +AC_LANG([C]) AC_C_CONST AC_C_INLINE test "$ac_cv_c_inline" != no && AC_DEFINE(CC_HAS_INLINE_FUNCS) @@ -1012,7 +1010,7 @@ # Check for C++ compiler characteristics (and ensure that it's there!) if test -n "$CXX" ; then - AC_LANG_CPLUSPLUS + AC_LANG([C++]) CF_STDCPP_LIBRARY case $GXX_VERSION in @@ -1286,15 +1284,16 @@ ################################################################################ test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in" -AC_OUTPUT( \ +AC_CONFIG_FILES([\ include/MKterm.h.awk \ include/curses.head:include/curses.h.in \ include/termcap.h \ include/unctrl.h \ $SUB_MAKEFILES \ - Makefile,[ + Makefile]) +AC_CONFIG_COMMANDS([default],[[ CF_LIB_RULES -],[ +]],[[ ### Special initialization commands, used to pass information from the ### configuration-run into config.status @@ -1324,5 +1323,6 @@ cf_with_cxx_binding="$cf_with_cxx_binding" host="$host" -],cat)dnl +]]) +AC_OUTPUTdnl ${MAKE-make} preinstall --- ncurses-5.3/./test/configure.in~configure +++ ncurses-5.3/./test/configure.in @@ -38,8 +38,9 @@ dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl --------------------------------------------------------------------------- -AC_PREREQ(2.13.20020210) -AC_INIT(ncurses.c) +AC_PREREQ(2.57) +AC_INIT +AC_CONFIG_SRCDIR([ncurses.c]) AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) CF_INHERIT_SCRIPT(config.guess) @@ -129,7 +130,7 @@ AC_TYPE_SIGNAL -AC_STDC_HEADERS +AC_HEADER_STDC([]) AC_HEADER_TIME AC_CHECK_HEADERS( \ form.h \ @@ -160,9 +161,8 @@ wresize \ ) -AC_TRY_LINK([ -#include <${cf_cv_ncurses_header-curses.h}>], -[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include <${cf_cv_ncurses_header-curses.h}>]], [[ (void) assume_default_colors (0, 0); (void) curses_version (); (void) define_key (0, 0); @@ -175,7 +175,7 @@ (void) use_default_colors (); (void) use_extended_names (0); (void) wresize (0, 0, 0); - ],[AC_DEFINE(NCURSES_EXT_FUNCS)]) + ]])],[AC_DEFINE(NCURSES_EXT_FUNCS)],[]) CF_SYS_TIME_SELECT CF_FUNC_CURSES_VERSION @@ -186,7 +186,8 @@ dnl --------------------------------------------------------------------------- -AC_OUTPUT(Makefile,[ +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_COMMANDS([default],[[ cat >>Makefile <