| aclocal.m4 (157184) | aclocal.m4 (165670) |
|---|---|
| 1dnl 2dnl Bash specific tests 3dnl 4dnl Some derived from PDKSH 5.1.3 autoconf tests 5dnl 6 7AC_DEFUN(BASH_C_LONG_LONG, 8[AC_CACHE_CHECK(for long long, ac_cv_c_long_long, --- 919 unchanged lines hidden (view full) --- 928], bash_cv_struct_stat_st_blocks=yes, bash_cv_struct_stat_st_blocks=no) 929]) 930AC_MSG_RESULT($bash_cv_struct_stat_st_blocks) 931if test "$bash_cv_struct_stat_st_blocks" = "yes"; then 932AC_DEFINE(HAVE_STRUCT_STAT_ST_BLOCKS) 933fi 934]) 935 | 1dnl 2dnl Bash specific tests 3dnl 4dnl Some derived from PDKSH 5.1.3 autoconf tests 5dnl 6 7AC_DEFUN(BASH_C_LONG_LONG, 8[AC_CACHE_CHECK(for long long, ac_cv_c_long_long, --- 919 unchanged lines hidden (view full) --- 928], bash_cv_struct_stat_st_blocks=yes, bash_cv_struct_stat_st_blocks=no) 929]) 930AC_MSG_RESULT($bash_cv_struct_stat_st_blocks) 931if test "$bash_cv_struct_stat_st_blocks" = "yes"; then 932AC_DEFINE(HAVE_STRUCT_STAT_ST_BLOCKS) 933fi 934]) 935 |
| 936AC_DEFUN(BASH_CHECK_LIB_TERMCAP, | 936AC_DEFUN([BASH_CHECK_LIB_TERMCAP], |
| 937[ 938if test "X$bash_cv_termcap_lib" = "X"; then 939_bash_needmsg=yes 940else 941AC_MSG_CHECKING(which library has the termcap functions) 942_bash_needmsg= 943fi 944AC_CACHE_VAL(bash_cv_termcap_lib, --- 590 unchanged lines hidden (view full) --- 1535if test $bash_cv_getpw_declared = yes; then 1536AC_DEFINE(HAVE_GETPW_DECLS) 1537fi 1538]) 1539 1540AC_DEFUN(BASH_CHECK_DEV_FD, 1541[AC_MSG_CHECKING(whether /dev/fd is available) 1542AC_CACHE_VAL(bash_cv_dev_fd, | 937[ 938if test "X$bash_cv_termcap_lib" = "X"; then 939_bash_needmsg=yes 940else 941AC_MSG_CHECKING(which library has the termcap functions) 942_bash_needmsg= 943fi 944AC_CACHE_VAL(bash_cv_termcap_lib, --- 590 unchanged lines hidden (view full) --- 1535if test $bash_cv_getpw_declared = yes; then 1536AC_DEFINE(HAVE_GETPW_DECLS) 1537fi 1538]) 1539 1540AC_DEFUN(BASH_CHECK_DEV_FD, 1541[AC_MSG_CHECKING(whether /dev/fd is available) 1542AC_CACHE_VAL(bash_cv_dev_fd, |
| 1543[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then | 1543[bash_cv_dev_fd="" 1544if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then |
| 1544# check for systems like FreeBSD 5 that only provide /dev/fd/[012] | 1545# check for systems like FreeBSD 5 that only provide /dev/fd/[012] |
| 1545 exec 3<&0 | 1546 exec 3</dev/null |
| 1546 if test -r /dev/fd/3; then 1547 bash_cv_dev_fd=standard 1548 else 1549 bash_cv_dev_fd=absent 1550 fi 1551 exec 3<&- | 1547 if test -r /dev/fd/3; then 1548 bash_cv_dev_fd=standard 1549 else 1550 bash_cv_dev_fd=absent 1551 fi 1552 exec 3<&- |
| 1552 elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then 1553 bash_cv_dev_fd=whacky 1554 else 1555 bash_cv_dev_fd=absent 1556 fi | 1553fi 1554if test -z "$bash_cv_dev_fd" ; then 1555 if test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then 1556 bash_cv_dev_fd=whacky 1557 else 1558 bash_cv_dev_fd=absent 1559 fi 1560fi |
| 1557]) 1558AC_MSG_RESULT($bash_cv_dev_fd) 1559if test $bash_cv_dev_fd = "standard"; then 1560 AC_DEFINE(HAVE_DEV_FD) 1561 AC_DEFINE(DEV_FD_PREFIX, "/dev/fd/") 1562elif test $bash_cv_dev_fd = "whacky"; then 1563 AC_DEFINE(HAVE_DEV_FD) 1564 AC_DEFINE(DEV_FD_PREFIX, "/proc/self/fd/") --- 97 unchanged lines hidden (view full) --- 1662if test $bash_cv_unusable_rtsigs = yes; then 1663AC_DEFINE(UNUSABLE_RT_SIGNALS) 1664fi 1665]) 1666 1667dnl 1668dnl check for availability of multibyte characters and functions 1669dnl | 1561]) 1562AC_MSG_RESULT($bash_cv_dev_fd) 1563if test $bash_cv_dev_fd = "standard"; then 1564 AC_DEFINE(HAVE_DEV_FD) 1565 AC_DEFINE(DEV_FD_PREFIX, "/dev/fd/") 1566elif test $bash_cv_dev_fd = "whacky"; then 1567 AC_DEFINE(HAVE_DEV_FD) 1568 AC_DEFINE(DEV_FD_PREFIX, "/proc/self/fd/") --- 97 unchanged lines hidden (view full) --- 1666if test $bash_cv_unusable_rtsigs = yes; then 1667AC_DEFINE(UNUSABLE_RT_SIGNALS) 1668fi 1669]) 1670 1671dnl 1672dnl check for availability of multibyte characters and functions 1673dnl |
| 1674dnl geez, I wish I didn't have to check for all of this stuff separately 1675dnl |
|
| 1670AC_DEFUN(BASH_CHECK_MULTIBYTE, 1671[ 1672AC_CHECK_HEADERS(wctype.h) 1673AC_CHECK_HEADERS(wchar.h) 1674AC_CHECK_HEADERS(langinfo.h) 1675 1676AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) | 1676AC_DEFUN(BASH_CHECK_MULTIBYTE, 1677[ 1678AC_CHECK_HEADERS(wctype.h) 1679AC_CHECK_HEADERS(wchar.h) 1680AC_CHECK_HEADERS(langinfo.h) 1681 1682AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) |
| 1677AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC)) | |
| 1678AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN)) | 1683AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN)) |
| 1679AC_CHECK_FUNC(wctomb, AC_DEFINE(HAVE_WCTOMB)) 1680AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) | 1684 1685AC_CHECK_FUNC(wcrtomb, AC_DEFINE(HAVE_WCRTOMB)) 1686AC_CHECK_FUNC(wcscoll, AC_DEFINE(HAVE_WCSCOLL)) |
| 1681AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP)) | 1687AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP)) |
| 1688AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) 1689AC_CHECK_FUNC(wctype, AC_DEFINE(HAVE_WCTYPE)) |
|
| 1682 | 1690 |
| 1683AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, 1684[AC_TRY_COMPILE([ 1685#include <wchar.h>], [ 1686 mbstate_t ps; 1687 mbstate_t *psp; 1688 psp = (mbstate_t *)0; 1689], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) 1690if test $bash_cv_have_mbstate_t = yes; then | 1691dnl checks for both mbrtowc and mbstate_t 1692AC_FUNC_MBRTOWC 1693if test $ac_cv_func_mbrtowc = yes; then |
| 1691 AC_DEFINE(HAVE_MBSTATE_T) 1692fi 1693 | 1694 AC_DEFINE(HAVE_MBSTATE_T) 1695fi 1696 |
| 1697AC_CHECK_FUNCS(iswlower iswupper towlower towupper iswctype) 1698 |
|
| 1694AC_CACHE_CHECK([for nl_langinfo and CODESET], bash_cv_langinfo_codeset, 1695[AC_TRY_LINK( 1696[#include <langinfo.h>], 1697[char* cs = nl_langinfo(CODESET);], 1698bash_cv_langinfo_codeset=yes, bash_cv_langinfo_codeset=no)]) 1699if test $bash_cv_langinfo_codeset = yes; then 1700 AC_DEFINE(HAVE_LANGINFO_CODESET) 1701fi 1702 | 1699AC_CACHE_CHECK([for nl_langinfo and CODESET], bash_cv_langinfo_codeset, 1700[AC_TRY_LINK( 1701[#include <langinfo.h>], 1702[char* cs = nl_langinfo(CODESET);], 1703bash_cv_langinfo_codeset=yes, bash_cv_langinfo_codeset=no)]) 1704if test $bash_cv_langinfo_codeset = yes; then 1705 AC_DEFINE(HAVE_LANGINFO_CODESET) 1706fi 1707 |
| 1708dnl check for wchar_t in <wchar.h> 1709AC_CACHE_CHECK([for wchar_t in wchar.h], bash_cv_type_wchar_t, 1710[AC_TRY_COMPILE( 1711[#include <wchar.h> 1712], 1713[ 1714 wchar_t foo; 1715 foo = 0; 1716], bash_cv_type_wchar_t=yes, bash_cv_type_wchar_t=no)]) 1717if test $bash_cv_type_wchar_t = yes; then 1718 AC_DEFINE(HAVE_WCHAR_T, 1, [systems should define this type here]) 1719fi 1720 1721dnl check for wctype_t in <wctype.h> 1722AC_CACHE_CHECK([for wctype_t in wctype.h], bash_cv_type_wctype_t, 1723[AC_TRY_COMPILE( 1724[#include <wctype.h>], 1725[ 1726 wctype_t foo; 1727 foo = 0; 1728], bash_cv_type_wctype_t=yes, bash_cv_type_wctype_t=no)]) 1729if test $bash_cv_type_wctype_t = yes; then 1730 AC_DEFINE(HAVE_WCTYPE_T, 1, [systems should define this type here]) 1731fi 1732 1733dnl check for wint_t in <wctype.h> 1734AC_CACHE_CHECK([for wint_t in wctype.h], bash_cv_type_wint_t, 1735[AC_TRY_COMPILE( 1736[#include <wctype.h>], 1737[ 1738 wint_t foo; 1739 foo = 0; 1740], bash_cv_type_wint_t=yes, bash_cv_type_wint_t=no)]) 1741if test $bash_cv_type_wint_t = yes; then 1742 AC_DEFINE(HAVE_WINT_T, 1, [systems should define this type here]) 1743fi 1744 |
|
| 1703]) 1704 1705dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB 1706dnl require: 1707dnl AC_PROG_CC 1708dnl BASH_CHECK_LIB_TERMCAP 1709 | 1745]) 1746 1747dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB 1748dnl require: 1749dnl AC_PROG_CC 1750dnl BASH_CHECK_LIB_TERMCAP 1751 |
| 1710AC_DEFUN(RL_LIB_READLINE_VERSION, | 1752AC_DEFUN([RL_LIB_READLINE_VERSION], |
| 1711[ 1712AC_REQUIRE([BASH_CHECK_LIB_TERMCAP]) 1713 1714AC_MSG_CHECKING([version of installed readline library]) 1715 1716# What a pain in the ass this is. 1717 1718# save cpp and ld options --- 2241 unchanged lines hidden --- | 1753[ 1754AC_REQUIRE([BASH_CHECK_LIB_TERMCAP]) 1755 1756AC_MSG_CHECKING([version of installed readline library]) 1757 1758# What a pain in the ass this is. 1759 1760# save cpp and ld options --- 2241 unchanged lines hidden --- |