ncurses 5.9 - patch 20120114

[ncurses.git] / test / aclocal.m4

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index b716e6ea1e3b0fd375b2095daebc3d703b509a5e..e34069d64c96f5a7419d420421a04da6f785502f 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright (c) 2003-2010,2011 Free Software Foundation, Inc.              *
+dnl Copyright (c) 2003-2011,2012 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                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *


@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl

-dnl $Id: aclocal.m4,v 1.73 2011/12/11 00:06:02 tom Exp $
+dnl $Id: aclocal.m4,v 1.74 2012/01/14 17:16:53 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -3102,6 +3102,60 @@ if test "$with_dmalloc" = yes ; then
        AC_CHECK_HEADER(dmalloc.h,
                [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))])
 fi
        AC_CHECK_HEADER(dmalloc.h,
                [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))])
 fi

+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_NCURSES_ETC version: 2 updated: 2012/01/13 10:49:00
+dnl -------------------
+dnl Use this macro for programs which use any variant of "curses", e.g.,
+dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
+dnl library (such as slang) should use a "--with-screen=XXX" option.
+dnl
+dnl This does not use AC_DEFUN, because that would tell autoconf to run each
+dnl of the macros inside this one - before this macro.
+define([CF_WITH_NCURSES_ETC],[
+CF_WITH_CURSES_DIR
+
+cf_cv_screen=curses
+
+AC_MSG_CHECKING(for specified curses library type)
+AC_ARG_WITH(ncursesw,
+       [  --with-ncursesw         use wide ncurses-libraries],
+       [cf_cv_screen=ncursesw],[
+
+AC_ARG_WITH(ncurses,
+       [  --with-ncurses          use ncurses-libraries],
+       [cf_cv_screen=ncurses],[
+
+AC_ARG_WITH(pdcurses,
+       [  --with-pdcurses         compile/link with pdcurses X11 library],
+       [cf_cv_screen=pdcurses],[
+
+AC_ARG_WITH(curses-colr,
+       [  --with-curses-colr      compile/link with HPUX 10.x color-curses],
+       [cf_cv_screen=curses_colr],[
+
+AC_ARG_WITH(curses-5lib,
+       [  --with-curses-5lib      compile/link with SunOS 5lib curses],
+       [cf_cv_screen=curses_5lib])])])])])
+
+AC_MSG_RESULT($cf_cv_screen)
+
+case $cf_cv_screen in #(vi
+curses|curses_*) #(vi
+       CF_CURSES_CONFIG
+       ;;
+ncurses) #(vi
+       CF_NCURSES_CONFIG
+       ;;
+ncursesw) #(vi
+       CF_UTF8_LIB
+       CF_NCURSES_CONFIG(ncursesw)
+       ;;
+pdcurses)
+       CF_PDCURSES_X11
+       ;;
+esac
+

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21


@@ -3151,7 +3205,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 41 updated: 2011/12/10 18:58:47
+dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -3178,6 +3232,7 @@ darwin[[0-8]].*) #(vi
        ;;
 darwin*) #(vi
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        ;;
 darwin*) #(vi
        cf_xopen_source="-D_DARWIN_C_SOURCE"

+       cf_XOPEN_SOURCE=

        ;;
 freebsd*|dragonfly*) #(vi
        # 5.x headers associate
        ;;
 freebsd*|dragonfly*) #(vi
        # 5.x headers associate


@@ -3210,6 +3265,7 @@ netbsd*) #(vi
        ;;
 openbsd[[4-9]]*) #(vi
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
        ;;
 openbsd[[4-9]]*) #(vi
        # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw

+       cf_xopen_source="-D_BSD_SOURCE"

        cf_XOPEN_SOURCE=600
        ;;
 openbsd*) #(vi
        cf_XOPEN_SOURCE=600
        ;;
 openbsd*) #(vi