diff options
| -rw-r--r-- | .dir-locals.el | 2 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 708 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 12 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/NEWS.23 | 7 | ||||
| -rw-r--r-- | lisp/ChangeLog | 60 | ||||
| -rw-r--r-- | lisp/Makefile.in | 1 | ||||
| -rw-r--r-- | lisp/dired.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/files.el | 1 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 3 | ||||
| -rw-r--r-- | lisp/locate.el | 17 | ||||
| -rw-r--r-- | lisp/ls-lisp.el | 3 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 13 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 18 | ||||
| -rw-r--r-- | lisp/progmodes/tcl.el | 10 | ||||
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 43 | ||||
| -rw-r--r-- | lisp/server.el | 28 | ||||
| -rw-r--r-- | lisp/vc/vc-mtn.el | 6 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 6 | ||||
| -rw-r--r-- | oldXMenu/XDelAssoc.c | 1 | ||||
| -rw-r--r-- | oldXMenu/XMakeAssoc.c | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 23 | ||||
| -rw-r--r-- | src/config.in | 3 | ||||
| -rw-r--r-- | src/image.c | 11 | ||||
| -rw-r--r-- | src/xfns.c | 39 | ||||
| -rw-r--r-- | src/xterm.c | 2 | ||||
| -rw-r--r-- | src/xterm.h | 4 |
32 files changed, 586 insertions, 465 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index f12dbf7d859..873f733854d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | (sentence-end-double-space . t) | 2 | (sentence-end-double-space . t) |
| 3 | (fill-column . 70))) | 3 | (fill-column . 70))) |
| 4 | (c-mode . ((c-file-style . "GNU"))) | 4 | (c-mode . ((c-file-style . "GNU"))) |
| 5 | (log-edit-mode . ((log-edit-rewrite-fixes | ||
| 6 | " (bug#\\([0-9]+\\))" . "debbugs:\\1"))) | ||
| 5 | (change-log-mode . ((add-log-time-zone-rule . t) | 7 | (change-log-mode . ((add-log-time-zone-rule . t) |
| 6 | (fill-column . 74) | 8 | (fill-column . 74) |
| 7 | (bug-reference-url-format . "http://debbugs.gnu.org/%s") | 9 | (bug-reference-url-format . "http://debbugs.gnu.org/%s") |
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-11-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes. | ||
| 4 | |||
| 5 | 2010-11-09 Michael Albinus <michael.albinus@gmx.de> | ||
| 6 | |||
| 7 | * configure.in: Don't write a warning for D-Bus anymore. | ||
| 8 | |||
| 1 | 2010-11-06 Andreas Schwab <schwab@linux-m68k.org> | 9 | 2010-11-06 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 10 | ||
| 3 | * configure.in: Fix indentation. | 11 | * configure.in: Fix indentation. |
| @@ -1,6 +1,6 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
| 3 | # Generated by GNU Autoconf 2.68 for emacs 24.0.50. | 3 | # Generated by GNU Autoconf 2.67 for emacs 24.0.50. |
| 4 | # | 4 | # |
| 5 | # | 5 | # |
| 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| @@ -89,7 +89,6 @@ fi | |||
| 89 | IFS=" "" $as_nl" | 89 | IFS=" "" $as_nl" |
| 90 | 90 | ||
| 91 | # Find who we are. Look in the path if we contain no directory separator. | 91 | # Find who we are. Look in the path if we contain no directory separator. |
| 92 | as_myself= | ||
| 93 | case $0 in #(( | 92 | case $0 in #(( |
| 94 | *[\\/]* ) as_myself=$0 ;; | 93 | *[\\/]* ) as_myself=$0 ;; |
| 95 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 94 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| @@ -215,18 +214,11 @@ IFS=$as_save_IFS | |||
| 215 | # We cannot yet assume a decent shell, so we have to provide a | 214 | # We cannot yet assume a decent shell, so we have to provide a |
| 216 | # neutralization value for shells without unset; and this also | 215 | # neutralization value for shells without unset; and this also |
| 217 | # works around shells that cannot unset nonexistent variables. | 216 | # works around shells that cannot unset nonexistent variables. |
| 218 | # Preserve -v and -x to the replacement shell. | ||
| 219 | BASH_ENV=/dev/null | 217 | BASH_ENV=/dev/null |
| 220 | ENV=/dev/null | 218 | ENV=/dev/null |
| 221 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | 219 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
| 222 | export CONFIG_SHELL | 220 | export CONFIG_SHELL |
| 223 | case $- in # (((( | 221 | exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
| 224 | *v*x* | *x*v* ) as_opts=-vx ;; | ||
| 225 | *v* ) as_opts=-v ;; | ||
| 226 | *x* ) as_opts=-x ;; | ||
| 227 | * ) as_opts= ;; | ||
| 228 | esac | ||
| 229 | exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} | ||
| 230 | fi | 222 | fi |
| 231 | 223 | ||
| 232 | if test x$as_have_required = xno; then : | 224 | if test x$as_have_required = xno; then : |
| @@ -1262,7 +1254,7 @@ Try \`$0 --help' for more information" | |||
| 1262 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 | 1254 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
| 1263 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && | 1255 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1264 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 | 1256 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
| 1265 | : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" | 1257 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
| 1266 | ;; | 1258 | ;; |
| 1267 | 1259 | ||
| 1268 | esac | 1260 | esac |
| @@ -1633,7 +1625,7 @@ test -n "$ac_init_help" && exit $ac_status | |||
| 1633 | if $ac_init_version; then | 1625 | if $ac_init_version; then |
| 1634 | cat <<\_ACEOF | 1626 | cat <<\_ACEOF |
| 1635 | emacs configure 24.0.50 | 1627 | emacs configure 24.0.50 |
| 1636 | generated by GNU Autoconf 2.68 | 1628 | generated by GNU Autoconf 2.67 |
| 1637 | 1629 | ||
| 1638 | Copyright (C) 2010 Free Software Foundation, Inc. | 1630 | Copyright (C) 2010 Free Software Foundation, Inc. |
| 1639 | This configure script is free software; the Free Software Foundation | 1631 | This configure script is free software; the Free Software Foundation |
| @@ -1679,7 +1671,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
| 1679 | 1671 | ||
| 1680 | ac_retval=1 | 1672 | ac_retval=1 |
| 1681 | fi | 1673 | fi |
| 1682 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1674 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1683 | as_fn_set_status $ac_retval | 1675 | as_fn_set_status $ac_retval |
| 1684 | 1676 | ||
| 1685 | } # ac_fn_c_try_compile | 1677 | } # ac_fn_c_try_compile |
| @@ -1725,7 +1717,7 @@ fi | |||
| 1725 | # interfere with the next link command; also delete a directory that is | 1717 | # interfere with the next link command; also delete a directory that is |
| 1726 | # left behind by Apple's compiler. We do this before executing the actions. | 1718 | # left behind by Apple's compiler. We do this before executing the actions. |
| 1727 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo | 1719 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| 1728 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1720 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1729 | as_fn_set_status $ac_retval | 1721 | as_fn_set_status $ac_retval |
| 1730 | 1722 | ||
| 1731 | } # ac_fn_c_try_link | 1723 | } # ac_fn_c_try_link |
| @@ -1762,7 +1754,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
| 1762 | 1754 | ||
| 1763 | ac_retval=1 | 1755 | ac_retval=1 |
| 1764 | fi | 1756 | fi |
| 1765 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1757 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1766 | as_fn_set_status $ac_retval | 1758 | as_fn_set_status $ac_retval |
| 1767 | 1759 | ||
| 1768 | } # ac_fn_c_try_cpp | 1760 | } # ac_fn_c_try_cpp |
| @@ -1775,10 +1767,10 @@ fi | |||
| 1775 | ac_fn_c_check_header_mongrel () | 1767 | ac_fn_c_check_header_mongrel () |
| 1776 | { | 1768 | { |
| 1777 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 1769 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 1778 | if eval \${$3+:} false; then : | 1770 | if eval "test \"\${$3+set}\"" = set; then : |
| 1779 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1771 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 1780 | $as_echo_n "checking for $2... " >&6; } | 1772 | $as_echo_n "checking for $2... " >&6; } |
| 1781 | if eval \${$3+:} false; then : | 1773 | if eval "test \"\${$3+set}\"" = set; then : |
| 1782 | $as_echo_n "(cached) " >&6 | 1774 | $as_echo_n "(cached) " >&6 |
| 1783 | fi | 1775 | fi |
| 1784 | eval ac_res=\$$3 | 1776 | eval ac_res=\$$3 |
| @@ -1841,7 +1833,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | |||
| 1841 | esac | 1833 | esac |
| 1842 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1834 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 1843 | $as_echo_n "checking for $2... " >&6; } | 1835 | $as_echo_n "checking for $2... " >&6; } |
| 1844 | if eval \${$3+:} false; then : | 1836 | if eval "test \"\${$3+set}\"" = set; then : |
| 1845 | $as_echo_n "(cached) " >&6 | 1837 | $as_echo_n "(cached) " >&6 |
| 1846 | else | 1838 | else |
| 1847 | eval "$3=\$ac_header_compiler" | 1839 | eval "$3=\$ac_header_compiler" |
| @@ -1850,7 +1842,7 @@ eval ac_res=\$$3 | |||
| 1850 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 1842 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 1851 | $as_echo "$ac_res" >&6; } | 1843 | $as_echo "$ac_res" >&6; } |
| 1852 | fi | 1844 | fi |
| 1853 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1845 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1854 | 1846 | ||
| 1855 | } # ac_fn_c_check_header_mongrel | 1847 | } # ac_fn_c_check_header_mongrel |
| 1856 | 1848 | ||
| @@ -1891,7 +1883,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
| 1891 | ac_retval=$ac_status | 1883 | ac_retval=$ac_status |
| 1892 | fi | 1884 | fi |
| 1893 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo | 1885 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| 1894 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1886 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1895 | as_fn_set_status $ac_retval | 1887 | as_fn_set_status $ac_retval |
| 1896 | 1888 | ||
| 1897 | } # ac_fn_c_try_run | 1889 | } # ac_fn_c_try_run |
| @@ -1905,7 +1897,7 @@ ac_fn_c_check_header_compile () | |||
| 1905 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 1897 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 1906 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1898 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 1907 | $as_echo_n "checking for $2... " >&6; } | 1899 | $as_echo_n "checking for $2... " >&6; } |
| 1908 | if eval \${$3+:} false; then : | 1900 | if eval "test \"\${$3+set}\"" = set; then : |
| 1909 | $as_echo_n "(cached) " >&6 | 1901 | $as_echo_n "(cached) " >&6 |
| 1910 | else | 1902 | else |
| 1911 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 1903 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -1923,7 +1915,7 @@ fi | |||
| 1923 | eval ac_res=\$$3 | 1915 | eval ac_res=\$$3 |
| 1924 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 1916 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 1925 | $as_echo "$ac_res" >&6; } | 1917 | $as_echo "$ac_res" >&6; } |
| 1926 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1918 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1927 | 1919 | ||
| 1928 | } # ac_fn_c_check_header_compile | 1920 | } # ac_fn_c_check_header_compile |
| 1929 | 1921 | ||
| @@ -1938,7 +1930,7 @@ ac_fn_c_check_decl () | |||
| 1938 | as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` | 1930 | as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` |
| 1939 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 | 1931 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 |
| 1940 | $as_echo_n "checking whether $as_decl_name is declared... " >&6; } | 1932 | $as_echo_n "checking whether $as_decl_name is declared... " >&6; } |
| 1941 | if eval \${$3+:} false; then : | 1933 | if eval "test \"\${$3+set}\"" = set; then : |
| 1942 | $as_echo_n "(cached) " >&6 | 1934 | $as_echo_n "(cached) " >&6 |
| 1943 | else | 1935 | else |
| 1944 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 1936 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -1969,7 +1961,7 @@ fi | |||
| 1969 | eval ac_res=\$$3 | 1961 | eval ac_res=\$$3 |
| 1970 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 1962 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 1971 | $as_echo "$ac_res" >&6; } | 1963 | $as_echo "$ac_res" >&6; } |
| 1972 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1964 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 1973 | 1965 | ||
| 1974 | } # ac_fn_c_check_decl | 1966 | } # ac_fn_c_check_decl |
| 1975 | 1967 | ||
| @@ -1981,7 +1973,7 @@ ac_fn_c_check_header_preproc () | |||
| 1981 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 1973 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 1982 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1974 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 1983 | $as_echo_n "checking for $2... " >&6; } | 1975 | $as_echo_n "checking for $2... " >&6; } |
| 1984 | if eval \${$3+:} false; then : | 1976 | if eval "test \"\${$3+set}\"" = set; then : |
| 1985 | $as_echo_n "(cached) " >&6 | 1977 | $as_echo_n "(cached) " >&6 |
| 1986 | else | 1978 | else |
| 1987 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 1979 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -1998,7 +1990,7 @@ fi | |||
| 1998 | eval ac_res=\$$3 | 1990 | eval ac_res=\$$3 |
| 1999 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 1991 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 2000 | $as_echo "$ac_res" >&6; } | 1992 | $as_echo "$ac_res" >&6; } |
| 2001 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 1993 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 2002 | 1994 | ||
| 2003 | } # ac_fn_c_check_header_preproc | 1995 | } # ac_fn_c_check_header_preproc |
| 2004 | 1996 | ||
| @@ -2011,7 +2003,7 @@ ac_fn_c_check_member () | |||
| 2011 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2003 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 2012 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 | 2004 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 |
| 2013 | $as_echo_n "checking for $2.$3... " >&6; } | 2005 | $as_echo_n "checking for $2.$3... " >&6; } |
| 2014 | if eval \${$4+:} false; then : | 2006 | if eval "test \"\${$4+set}\"" = set; then : |
| 2015 | $as_echo_n "(cached) " >&6 | 2007 | $as_echo_n "(cached) " >&6 |
| 2016 | else | 2008 | else |
| 2017 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 2009 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -2055,7 +2047,7 @@ fi | |||
| 2055 | eval ac_res=\$$4 | 2047 | eval ac_res=\$$4 |
| 2056 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 2048 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 2057 | $as_echo "$ac_res" >&6; } | 2049 | $as_echo "$ac_res" >&6; } |
| 2058 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 2050 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 2059 | 2051 | ||
| 2060 | } # ac_fn_c_check_member | 2052 | } # ac_fn_c_check_member |
| 2061 | 2053 | ||
| @@ -2067,7 +2059,7 @@ ac_fn_c_check_func () | |||
| 2067 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2059 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 2068 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2060 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 2069 | $as_echo_n "checking for $2... " >&6; } | 2061 | $as_echo_n "checking for $2... " >&6; } |
| 2070 | if eval \${$3+:} false; then : | 2062 | if eval "test \"\${$3+set}\"" = set; then : |
| 2071 | $as_echo_n "(cached) " >&6 | 2063 | $as_echo_n "(cached) " >&6 |
| 2072 | else | 2064 | else |
| 2073 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 2065 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -2122,7 +2114,7 @@ fi | |||
| 2122 | eval ac_res=\$$3 | 2114 | eval ac_res=\$$3 |
| 2123 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 2115 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 2124 | $as_echo "$ac_res" >&6; } | 2116 | $as_echo "$ac_res" >&6; } |
| 2125 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 2117 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 2126 | 2118 | ||
| 2127 | } # ac_fn_c_check_func | 2119 | } # ac_fn_c_check_func |
| 2128 | 2120 | ||
| @@ -2135,7 +2127,7 @@ ac_fn_c_check_type () | |||
| 2135 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2127 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
| 2136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2128 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
| 2137 | $as_echo_n "checking for $2... " >&6; } | 2129 | $as_echo_n "checking for $2... " >&6; } |
| 2138 | if eval \${$3+:} false; then : | 2130 | if eval "test \"\${$3+set}\"" = set; then : |
| 2139 | $as_echo_n "(cached) " >&6 | 2131 | $as_echo_n "(cached) " >&6 |
| 2140 | else | 2132 | else |
| 2141 | eval "$3=no" | 2133 | eval "$3=no" |
| @@ -2176,7 +2168,7 @@ fi | |||
| 2176 | eval ac_res=\$$3 | 2168 | eval ac_res=\$$3 |
| 2177 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | 2169 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
| 2178 | $as_echo "$ac_res" >&6; } | 2170 | $as_echo "$ac_res" >&6; } |
| 2179 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | 2171 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| 2180 | 2172 | ||
| 2181 | } # ac_fn_c_check_type | 2173 | } # ac_fn_c_check_type |
| 2182 | cat >config.log <<_ACEOF | 2174 | cat >config.log <<_ACEOF |
| @@ -2184,7 +2176,7 @@ This file contains any messages produced by compilers while | |||
| 2184 | running configure, to aid debugging if configure makes a mistake. | 2176 | running configure, to aid debugging if configure makes a mistake. |
| 2185 | 2177 | ||
| 2186 | It was created by emacs $as_me 24.0.50, which was | 2178 | It was created by emacs $as_me 24.0.50, which was |
| 2187 | generated by GNU Autoconf 2.68. Invocation command line was | 2179 | generated by GNU Autoconf 2.67. Invocation command line was |
| 2188 | 2180 | ||
| 2189 | $ $0 $@ | 2181 | $ $0 $@ |
| 2190 | 2182 | ||
| @@ -2442,7 +2434,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} | |||
| 2442 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 2434 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 2443 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 2435 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2444 | as_fn_error $? "failed to load site script $ac_site_file | 2436 | as_fn_error $? "failed to load site script $ac_site_file |
| 2445 | See \`config.log' for more details" "$LINENO" 5; } | 2437 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 2446 | fi | 2438 | fi |
| 2447 | done | 2439 | done |
| 2448 | 2440 | ||
| @@ -3000,7 +2992,7 @@ do | |||
| 3000 | stringfreelist) ac_gc_check_string_free_list=1 ;; | 2992 | stringfreelist) ac_gc_check_string_free_list=1 ;; |
| 3001 | xmallocoverrun) ac_xmalloc_overrun=1 ;; | 2993 | xmallocoverrun) ac_xmalloc_overrun=1 ;; |
| 3002 | conslist) ac_gc_check_cons_list=1 ;; | 2994 | conslist) ac_gc_check_cons_list=1 ;; |
| 3003 | *) as_fn_error $? "unknown check category $check" "$LINENO" 5 ;; | 2995 | *) as_fn_error $? "unknown check category $check" "$LINENO" 5 ;; |
| 3004 | esac | 2996 | esac |
| 3005 | done | 2997 | done |
| 3006 | IFS="$ac_save_IFS" | 2998 | IFS="$ac_save_IFS" |
| @@ -3148,7 +3140,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | |||
| 3148 | 3140 | ||
| 3149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | 3141 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
| 3150 | $as_echo_n "checking build system type... " >&6; } | 3142 | $as_echo_n "checking build system type... " >&6; } |
| 3151 | if ${ac_cv_build+:} false; then : | 3143 | if test "${ac_cv_build+set}" = set; then : |
| 3152 | $as_echo_n "(cached) " >&6 | 3144 | $as_echo_n "(cached) " >&6 |
| 3153 | else | 3145 | else |
| 3154 | ac_build_alias=$build_alias | 3146 | ac_build_alias=$build_alias |
| @@ -3164,7 +3156,7 @@ fi | |||
| 3164 | $as_echo "$ac_cv_build" >&6; } | 3156 | $as_echo "$ac_cv_build" >&6; } |
| 3165 | case $ac_cv_build in | 3157 | case $ac_cv_build in |
| 3166 | *-*-*) ;; | 3158 | *-*-*) ;; |
| 3167 | *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; | 3159 | *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
| 3168 | esac | 3160 | esac |
| 3169 | build=$ac_cv_build | 3161 | build=$ac_cv_build |
| 3170 | ac_save_IFS=$IFS; IFS='-' | 3162 | ac_save_IFS=$IFS; IFS='-' |
| @@ -3182,7 +3174,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | |||
| 3182 | 3174 | ||
| 3183 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 | 3175 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
| 3184 | $as_echo_n "checking host system type... " >&6; } | 3176 | $as_echo_n "checking host system type... " >&6; } |
| 3185 | if ${ac_cv_host+:} false; then : | 3177 | if test "${ac_cv_host+set}" = set; then : |
| 3186 | $as_echo_n "(cached) " >&6 | 3178 | $as_echo_n "(cached) " >&6 |
| 3187 | else | 3179 | else |
| 3188 | if test "x$host_alias" = x; then | 3180 | if test "x$host_alias" = x; then |
| @@ -3197,7 +3189,7 @@ fi | |||
| 3197 | $as_echo "$ac_cv_host" >&6; } | 3189 | $as_echo "$ac_cv_host" >&6; } |
| 3198 | case $ac_cv_host in | 3190 | case $ac_cv_host in |
| 3199 | *-*-*) ;; | 3191 | *-*-*) ;; |
| 3200 | *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; | 3192 | *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
| 3201 | esac | 3193 | esac |
| 3202 | host=$ac_cv_host | 3194 | host=$ac_cv_host |
| 3203 | ac_save_IFS=$IFS; IFS='-' | 3195 | ac_save_IFS=$IFS; IFS='-' |
| @@ -3515,7 +3507,7 @@ if test -n "$ac_tool_prefix"; then | |||
| 3515 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | 3507 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
| 3516 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3508 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3517 | $as_echo_n "checking for $ac_word... " >&6; } | 3509 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3518 | if ${ac_cv_prog_CC+:} false; then : | 3510 | if test "${ac_cv_prog_CC+set}" = set; then : |
| 3519 | $as_echo_n "(cached) " >&6 | 3511 | $as_echo_n "(cached) " >&6 |
| 3520 | else | 3512 | else |
| 3521 | if test -n "$CC"; then | 3513 | if test -n "$CC"; then |
| @@ -3555,7 +3547,7 @@ if test -z "$ac_cv_prog_CC"; then | |||
| 3555 | set dummy gcc; ac_word=$2 | 3547 | set dummy gcc; ac_word=$2 |
| 3556 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3548 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3557 | $as_echo_n "checking for $ac_word... " >&6; } | 3549 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3558 | if ${ac_cv_prog_ac_ct_CC+:} false; then : | 3550 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| 3559 | $as_echo_n "(cached) " >&6 | 3551 | $as_echo_n "(cached) " >&6 |
| 3560 | else | 3552 | else |
| 3561 | if test -n "$ac_ct_CC"; then | 3553 | if test -n "$ac_ct_CC"; then |
| @@ -3608,7 +3600,7 @@ if test -z "$CC"; then | |||
| 3608 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | 3600 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
| 3609 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3601 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3610 | $as_echo_n "checking for $ac_word... " >&6; } | 3602 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3611 | if ${ac_cv_prog_CC+:} false; then : | 3603 | if test "${ac_cv_prog_CC+set}" = set; then : |
| 3612 | $as_echo_n "(cached) " >&6 | 3604 | $as_echo_n "(cached) " >&6 |
| 3613 | else | 3605 | else |
| 3614 | if test -n "$CC"; then | 3606 | if test -n "$CC"; then |
| @@ -3648,7 +3640,7 @@ if test -z "$CC"; then | |||
| 3648 | set dummy cc; ac_word=$2 | 3640 | set dummy cc; ac_word=$2 |
| 3649 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3641 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3650 | $as_echo_n "checking for $ac_word... " >&6; } | 3642 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3651 | if ${ac_cv_prog_CC+:} false; then : | 3643 | if test "${ac_cv_prog_CC+set}" = set; then : |
| 3652 | $as_echo_n "(cached) " >&6 | 3644 | $as_echo_n "(cached) " >&6 |
| 3653 | else | 3645 | else |
| 3654 | if test -n "$CC"; then | 3646 | if test -n "$CC"; then |
| @@ -3707,7 +3699,7 @@ if test -z "$CC"; then | |||
| 3707 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 3699 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 3708 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3700 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3709 | $as_echo_n "checking for $ac_word... " >&6; } | 3701 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3710 | if ${ac_cv_prog_CC+:} false; then : | 3702 | if test "${ac_cv_prog_CC+set}" = set; then : |
| 3711 | $as_echo_n "(cached) " >&6 | 3703 | $as_echo_n "(cached) " >&6 |
| 3712 | else | 3704 | else |
| 3713 | if test -n "$CC"; then | 3705 | if test -n "$CC"; then |
| @@ -3751,7 +3743,7 @@ do | |||
| 3751 | set dummy $ac_prog; ac_word=$2 | 3743 | set dummy $ac_prog; ac_word=$2 |
| 3752 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3744 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 3753 | $as_echo_n "checking for $ac_word... " >&6; } | 3745 | $as_echo_n "checking for $ac_word... " >&6; } |
| 3754 | if ${ac_cv_prog_ac_ct_CC+:} false; then : | 3746 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
| 3755 | $as_echo_n "(cached) " >&6 | 3747 | $as_echo_n "(cached) " >&6 |
| 3756 | else | 3748 | else |
| 3757 | if test -n "$ac_ct_CC"; then | 3749 | if test -n "$ac_ct_CC"; then |
| @@ -3806,7 +3798,7 @@ fi | |||
| 3806 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3798 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 3807 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3799 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 3808 | as_fn_error $? "no acceptable C compiler found in \$PATH | 3800 | as_fn_error $? "no acceptable C compiler found in \$PATH |
| 3809 | See \`config.log' for more details" "$LINENO" 5; } | 3801 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 3810 | 3802 | ||
| 3811 | # Provide some information about the compiler. | 3803 | # Provide some information about the compiler. |
| 3812 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | 3804 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
| @@ -3921,7 +3913,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
| 3921 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3913 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 3922 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3914 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 3923 | as_fn_error 77 "C compiler cannot create executables | 3915 | as_fn_error 77 "C compiler cannot create executables |
| 3924 | See \`config.log' for more details" "$LINENO" 5; } | 3916 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 3925 | else | 3917 | else |
| 3926 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3918 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| 3927 | $as_echo "yes" >&6; } | 3919 | $as_echo "yes" >&6; } |
| @@ -3964,7 +3956,7 @@ else | |||
| 3964 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3956 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 3965 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3957 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 3966 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link | 3958 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
| 3967 | See \`config.log' for more details" "$LINENO" 5; } | 3959 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 3968 | fi | 3960 | fi |
| 3969 | rm -f conftest conftest$ac_cv_exeext | 3961 | rm -f conftest conftest$ac_cv_exeext |
| 3970 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | 3962 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
| @@ -4023,7 +4015,7 @@ $as_echo "$ac_try_echo"; } >&5 | |||
| 4023 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4015 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 4024 | as_fn_error $? "cannot run C compiled programs. | 4016 | as_fn_error $? "cannot run C compiled programs. |
| 4025 | If you meant to cross compile, use \`--host'. | 4017 | If you meant to cross compile, use \`--host'. |
| 4026 | See \`config.log' for more details" "$LINENO" 5; } | 4018 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 4027 | fi | 4019 | fi |
| 4028 | fi | 4020 | fi |
| 4029 | fi | 4021 | fi |
| @@ -4034,7 +4026,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out | |||
| 4034 | ac_clean_files=$ac_clean_files_save | 4026 | ac_clean_files=$ac_clean_files_save |
| 4035 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 | 4027 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
| 4036 | $as_echo_n "checking for suffix of object files... " >&6; } | 4028 | $as_echo_n "checking for suffix of object files... " >&6; } |
| 4037 | if ${ac_cv_objext+:} false; then : | 4029 | if test "${ac_cv_objext+set}" = set; then : |
| 4038 | $as_echo_n "(cached) " >&6 | 4030 | $as_echo_n "(cached) " >&6 |
| 4039 | else | 4031 | else |
| 4040 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4032 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -4075,7 +4067,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
| 4075 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4067 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 4076 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4068 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 4077 | as_fn_error $? "cannot compute suffix of object files: cannot compile | 4069 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
| 4078 | See \`config.log' for more details" "$LINENO" 5; } | 4070 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 4079 | fi | 4071 | fi |
| 4080 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 4072 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
| 4081 | fi | 4073 | fi |
| @@ -4085,7 +4077,7 @@ OBJEXT=$ac_cv_objext | |||
| 4085 | ac_objext=$OBJEXT | 4077 | ac_objext=$OBJEXT |
| 4086 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 | 4078 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
| 4087 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } | 4079 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
| 4088 | if ${ac_cv_c_compiler_gnu+:} false; then : | 4080 | if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
| 4089 | $as_echo_n "(cached) " >&6 | 4081 | $as_echo_n "(cached) " >&6 |
| 4090 | else | 4082 | else |
| 4091 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4083 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -4122,7 +4114,7 @@ ac_test_CFLAGS=${CFLAGS+set} | |||
| 4122 | ac_save_CFLAGS=$CFLAGS | 4114 | ac_save_CFLAGS=$CFLAGS |
| 4123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 | 4115 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
| 4124 | $as_echo_n "checking whether $CC accepts -g... " >&6; } | 4116 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
| 4125 | if ${ac_cv_prog_cc_g+:} false; then : | 4117 | if test "${ac_cv_prog_cc_g+set}" = set; then : |
| 4126 | $as_echo_n "(cached) " >&6 | 4118 | $as_echo_n "(cached) " >&6 |
| 4127 | else | 4119 | else |
| 4128 | ac_save_c_werror_flag=$ac_c_werror_flag | 4120 | ac_save_c_werror_flag=$ac_c_werror_flag |
| @@ -4200,7 +4192,7 @@ else | |||
| 4200 | fi | 4192 | fi |
| 4201 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 | 4193 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
| 4202 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } | 4194 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
| 4203 | if ${ac_cv_prog_cc_c89+:} false; then : | 4195 | if test "${ac_cv_prog_cc_c89+set}" = set; then : |
| 4204 | $as_echo_n "(cached) " >&6 | 4196 | $as_echo_n "(cached) " >&6 |
| 4205 | else | 4197 | else |
| 4206 | ac_cv_prog_cc_c89=no | 4198 | ac_cv_prog_cc_c89=no |
| @@ -4308,7 +4300,7 @@ if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \ | |||
| 4308 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun C compiler" >&5 | 4300 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun C compiler" >&5 |
| 4309 | $as_echo_n "checking whether we are using a Sun C compiler... " >&6; } | 4301 | $as_echo_n "checking whether we are using a Sun C compiler... " >&6; } |
| 4310 | 4302 | ||
| 4311 | if ${emacs_cv_sunpro_c+:} false; then : | 4303 | if test "${emacs_cv_sunpro_c+set}" = set; then : |
| 4312 | $as_echo_n "(cached) " >&6 | 4304 | $as_echo_n "(cached) " >&6 |
| 4313 | else | 4305 | else |
| 4314 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4306 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -4377,7 +4369,7 @@ if test -n "$CPP" && test -d "$CPP"; then | |||
| 4377 | CPP= | 4369 | CPP= |
| 4378 | fi | 4370 | fi |
| 4379 | if test -z "$CPP"; then | 4371 | if test -z "$CPP"; then |
| 4380 | if ${ac_cv_prog_CPP+:} false; then : | 4372 | if test "${ac_cv_prog_CPP+set}" = set; then : |
| 4381 | $as_echo_n "(cached) " >&6 | 4373 | $as_echo_n "(cached) " >&6 |
| 4382 | else | 4374 | else |
| 4383 | # Double quotes because CPP needs to be expanded | 4375 | # Double quotes because CPP needs to be expanded |
| @@ -4493,7 +4485,7 @@ else | |||
| 4493 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4485 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 4494 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4486 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 4495 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check | 4487 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
| 4496 | See \`config.log' for more details" "$LINENO" 5; } | 4488 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 4497 | fi | 4489 | fi |
| 4498 | 4490 | ||
| 4499 | ac_ext=c | 4491 | ac_ext=c |
| @@ -4505,7 +4497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
| 4505 | 4497 | ||
| 4506 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 | 4498 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
| 4507 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } | 4499 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
| 4508 | if ${ac_cv_path_GREP+:} false; then : | 4500 | if test "${ac_cv_path_GREP+set}" = set; then : |
| 4509 | $as_echo_n "(cached) " >&6 | 4501 | $as_echo_n "(cached) " >&6 |
| 4510 | else | 4502 | else |
| 4511 | if test -z "$GREP"; then | 4503 | if test -z "$GREP"; then |
| @@ -4568,7 +4560,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } | |||
| 4568 | 4560 | ||
| 4569 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 | 4561 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
| 4570 | $as_echo_n "checking for egrep... " >&6; } | 4562 | $as_echo_n "checking for egrep... " >&6; } |
| 4571 | if ${ac_cv_path_EGREP+:} false; then : | 4563 | if test "${ac_cv_path_EGREP+set}" = set; then : |
| 4572 | $as_echo_n "(cached) " >&6 | 4564 | $as_echo_n "(cached) " >&6 |
| 4573 | else | 4565 | else |
| 4574 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | 4566 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
| @@ -4635,7 +4627,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } | |||
| 4635 | 4627 | ||
| 4636 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | 4628 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
| 4637 | $as_echo_n "checking for ANSI C header files... " >&6; } | 4629 | $as_echo_n "checking for ANSI C header files... " >&6; } |
| 4638 | if ${ac_cv_header_stdc+:} false; then : | 4630 | if test "${ac_cv_header_stdc+set}" = set; then : |
| 4639 | $as_echo_n "(cached) " >&6 | 4631 | $as_echo_n "(cached) " >&6 |
| 4640 | else | 4632 | else |
| 4641 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4633 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -4764,7 +4756,7 @@ done | |||
| 4764 | 4756 | ||
| 4765 | 4757 | ||
| 4766 | ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" | 4758 | ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" |
| 4767 | if test "x$ac_cv_header_minix_config_h" = xyes; then : | 4759 | if test "x$ac_cv_header_minix_config_h" = x""yes; then : |
| 4768 | MINIX=yes | 4760 | MINIX=yes |
| 4769 | else | 4761 | else |
| 4770 | MINIX= | 4762 | MINIX= |
| @@ -4786,7 +4778,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h | |||
| 4786 | 4778 | ||
| 4787 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 | 4779 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 |
| 4788 | $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } | 4780 | $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } |
| 4789 | if ${ac_cv_safe_to_define___extensions__+:} false; then : | 4781 | if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : |
| 4790 | $as_echo_n "(cached) " >&6 | 4782 | $as_echo_n "(cached) " >&6 |
| 4791 | else | 4783 | else |
| 4792 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4784 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -4966,7 +4958,7 @@ if test -n "$CPP" && test -d "$CPP"; then | |||
| 4966 | CPP= | 4958 | CPP= |
| 4967 | fi | 4959 | fi |
| 4968 | if test -z "$CPP"; then | 4960 | if test -z "$CPP"; then |
| 4969 | if ${ac_cv_prog_CPP+:} false; then : | 4961 | if test "${ac_cv_prog_CPP+set}" = set; then : |
| 4970 | $as_echo_n "(cached) " >&6 | 4962 | $as_echo_n "(cached) " >&6 |
| 4971 | else | 4963 | else |
| 4972 | # Double quotes because CPP needs to be expanded | 4964 | # Double quotes because CPP needs to be expanded |
| @@ -5082,7 +5074,7 @@ else | |||
| 5082 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 5074 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| 5083 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 5075 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 5084 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check | 5076 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
| 5085 | See \`config.log' for more details" "$LINENO" 5; } | 5077 | See \`config.log' for more details" "$LINENO" 5 ; } |
| 5086 | fi | 5078 | fi |
| 5087 | 5079 | ||
| 5088 | ac_ext=c | 5080 | ac_ext=c |
| @@ -5108,7 +5100,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
| 5108 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 | 5100 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
| 5109 | $as_echo_n "checking for a BSD-compatible install... " >&6; } | 5101 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
| 5110 | if test -z "$INSTALL"; then | 5102 | if test -z "$INSTALL"; then |
| 5111 | if ${ac_cv_path_install+:} false; then : | 5103 | if test "${ac_cv_path_install+set}" = set; then : |
| 5112 | $as_echo_n "(cached) " >&6 | 5104 | $as_echo_n "(cached) " >&6 |
| 5113 | else | 5105 | else |
| 5114 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 5106 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| @@ -5190,7 +5182,7 @@ if test "x$RANLIB" = x; then | |||
| 5190 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | 5182 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
| 5191 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5183 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5192 | $as_echo_n "checking for $ac_word... " >&6; } | 5184 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5193 | if ${ac_cv_prog_RANLIB+:} false; then : | 5185 | if test "${ac_cv_prog_RANLIB+set}" = set; then : |
| 5194 | $as_echo_n "(cached) " >&6 | 5186 | $as_echo_n "(cached) " >&6 |
| 5195 | else | 5187 | else |
| 5196 | if test -n "$RANLIB"; then | 5188 | if test -n "$RANLIB"; then |
| @@ -5230,7 +5222,7 @@ if test -z "$ac_cv_prog_RANLIB"; then | |||
| 5230 | set dummy ranlib; ac_word=$2 | 5222 | set dummy ranlib; ac_word=$2 |
| 5231 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5223 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5232 | $as_echo_n "checking for $ac_word... " >&6; } | 5224 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5233 | if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : | 5225 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
| 5234 | $as_echo_n "(cached) " >&6 | 5226 | $as_echo_n "(cached) " >&6 |
| 5235 | else | 5227 | else |
| 5236 | if test -n "$ac_ct_RANLIB"; then | 5228 | if test -n "$ac_ct_RANLIB"; then |
| @@ -5285,7 +5277,7 @@ fi | |||
| 5285 | ## is running in i386 mode, we can help them out. | 5277 | ## is running in i386 mode, we can help them out. |
| 5286 | if test "$machine" = "amdx86-64"; then | 5278 | if test "$machine" = "amdx86-64"; then |
| 5287 | ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default" | 5279 | ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default" |
| 5288 | if test "x$ac_cv_have_decl_i386" = xyes; then : | 5280 | if test "x$ac_cv_have_decl_i386" = x""yes; then : |
| 5289 | 5281 | ||
| 5290 | fi | 5282 | fi |
| 5291 | 5283 | ||
| @@ -5300,7 +5292,7 @@ fi | |||
| 5300 | set dummy install-info; ac_word=$2 | 5292 | set dummy install-info; ac_word=$2 |
| 5301 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5293 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5302 | $as_echo_n "checking for $ac_word... " >&6; } | 5294 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5303 | if ${ac_cv_path_INSTALL_INFO+:} false; then : | 5295 | if test "${ac_cv_path_INSTALL_INFO+set}" = set; then : |
| 5304 | $as_echo_n "(cached) " >&6 | 5296 | $as_echo_n "(cached) " >&6 |
| 5305 | else | 5297 | else |
| 5306 | case $INSTALL_INFO in | 5298 | case $INSTALL_INFO in |
| @@ -5340,7 +5332,7 @@ fi | |||
| 5340 | set dummy install-info; ac_word=$2 | 5332 | set dummy install-info; ac_word=$2 |
| 5341 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5333 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5342 | $as_echo_n "checking for $ac_word... " >&6; } | 5334 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5343 | if ${ac_cv_path_INSTALL_INFO+:} false; then : | 5335 | if test "${ac_cv_path_INSTALL_INFO+set}" = set; then : |
| 5344 | $as_echo_n "(cached) " >&6 | 5336 | $as_echo_n "(cached) " >&6 |
| 5345 | else | 5337 | else |
| 5346 | case $INSTALL_INFO in | 5338 | case $INSTALL_INFO in |
| @@ -5380,7 +5372,7 @@ fi | |||
| 5380 | set dummy install-info; ac_word=$2 | 5372 | set dummy install-info; ac_word=$2 |
| 5381 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5373 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5382 | $as_echo_n "checking for $ac_word... " >&6; } | 5374 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5383 | if ${ac_cv_path_INSTALL_INFO+:} false; then : | 5375 | if test "${ac_cv_path_INSTALL_INFO+set}" = set; then : |
| 5384 | $as_echo_n "(cached) " >&6 | 5376 | $as_echo_n "(cached) " >&6 |
| 5385 | else | 5377 | else |
| 5386 | case $INSTALL_INFO in | 5378 | case $INSTALL_INFO in |
| @@ -5421,7 +5413,7 @@ fi | |||
| 5421 | set dummy gzip; ac_word=$2 | 5413 | set dummy gzip; ac_word=$2 |
| 5422 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5414 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5423 | $as_echo_n "checking for $ac_word... " >&6; } | 5415 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5424 | if ${ac_cv_path_GZIP_PROG+:} false; then : | 5416 | if test "${ac_cv_path_GZIP_PROG+set}" = set; then : |
| 5425 | $as_echo_n "(cached) " >&6 | 5417 | $as_echo_n "(cached) " >&6 |
| 5426 | else | 5418 | else |
| 5427 | case $GZIP_PROG in | 5419 | case $GZIP_PROG in |
| @@ -5464,7 +5456,7 @@ fi | |||
| 5464 | set dummy makeinfo; ac_word=$2 | 5456 | set dummy makeinfo; ac_word=$2 |
| 5465 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5457 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5466 | $as_echo_n "checking for $ac_word... " >&6; } | 5458 | $as_echo_n "checking for $ac_word... " >&6; } |
| 5467 | if ${ac_cv_path_MAKEINFO+:} false; then : | 5459 | if test "${ac_cv_path_MAKEINFO+set}" = set; then : |
| 5468 | $as_echo_n "(cached) " >&6 | 5460 | $as_echo_n "(cached) " >&6 |
| 5469 | else | 5461 | else |
| 5470 | case $MAKEINFO in | 5462 | case $MAKEINFO in |
| @@ -5665,7 +5657,7 @@ esac | |||
| 5665 | C_SWITCH_MACHINE= | 5657 | C_SWITCH_MACHINE= |
| 5666 | if test "$machine" = "alpha"; then | 5658 | if test "$machine" = "alpha"; then |
| 5667 | ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default" | 5659 | ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default" |
| 5668 | if test "x$ac_cv_have_decl___ELF__" = xyes; then : | 5660 | if test "x$ac_cv_have_decl___ELF__" = x""yes; then : |
| 5669 | 5661 | ||
| 5670 | fi | 5662 | fi |
| 5671 | 5663 | ||
| @@ -5735,7 +5727,7 @@ if test "$enable_largefile" != no; then | |||
| 5735 | 5727 | ||
| 5736 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 | 5728 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 |
| 5737 | $as_echo_n "checking for special C compiler options needed for large files... " >&6; } | 5729 | $as_echo_n "checking for special C compiler options needed for large files... " >&6; } |
| 5738 | if ${ac_cv_sys_largefile_CC+:} false; then : | 5730 | if test "${ac_cv_sys_largefile_CC+set}" = set; then : |
| 5739 | $as_echo_n "(cached) " >&6 | 5731 | $as_echo_n "(cached) " >&6 |
| 5740 | else | 5732 | else |
| 5741 | ac_cv_sys_largefile_CC=no | 5733 | ac_cv_sys_largefile_CC=no |
| @@ -5786,7 +5778,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } | |||
| 5786 | 5778 | ||
| 5787 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | 5779 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 |
| 5788 | $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } | 5780 | $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } |
| 5789 | if ${ac_cv_sys_file_offset_bits+:} false; then : | 5781 | if test "${ac_cv_sys_file_offset_bits+set}" = set; then : |
| 5790 | $as_echo_n "(cached) " >&6 | 5782 | $as_echo_n "(cached) " >&6 |
| 5791 | else | 5783 | else |
| 5792 | while :; do | 5784 | while :; do |
| @@ -5855,7 +5847,7 @@ rm -rf conftest* | |||
| 5855 | if test $ac_cv_sys_file_offset_bits = unknown; then | 5847 | if test $ac_cv_sys_file_offset_bits = unknown; then |
| 5856 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 | 5848 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 |
| 5857 | $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } | 5849 | $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } |
| 5858 | if ${ac_cv_sys_large_files+:} false; then : | 5850 | if test "${ac_cv_sys_large_files+set}" = set; then : |
| 5859 | $as_echo_n "(cached) " >&6 | 5851 | $as_echo_n "(cached) " >&6 |
| 5860 | else | 5852 | else |
| 5861 | while :; do | 5853 | while :; do |
| @@ -6023,7 +6015,7 @@ done | |||
| 6023 | # Emulation library used on NetBSD. | 6015 | # Emulation library used on NetBSD. |
| 6024 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 | 6016 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 |
| 6025 | $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } | 6017 | $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } |
| 6026 | if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then : | 6018 | if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then : |
| 6027 | $as_echo_n "(cached) " >&6 | 6019 | $as_echo_n "(cached) " >&6 |
| 6028 | else | 6020 | else |
| 6029 | ac_check_lib_save_LIBS=$LIBS | 6021 | ac_check_lib_save_LIBS=$LIBS |
| @@ -6057,7 +6049,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 6057 | fi | 6049 | fi |
| 6058 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 | 6050 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 |
| 6059 | $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } | 6051 | $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } |
| 6060 | if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then : | 6052 | if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then : |
| 6061 | LIBSOUND=-lossaudio | 6053 | LIBSOUND=-lossaudio |
| 6062 | else | 6054 | else |
| 6063 | LIBSOUND= | 6055 | LIBSOUND= |
| @@ -6074,7 +6066,7 @@ fi | |||
| 6074 | set dummy pkg-config; ac_word=$2 | 6066 | set dummy pkg-config; ac_word=$2 |
| 6075 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6067 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6076 | $as_echo_n "checking for $ac_word... " >&6; } | 6068 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6077 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 6069 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 6078 | $as_echo_n "(cached) " >&6 | 6070 | $as_echo_n "(cached) " >&6 |
| 6079 | else | 6071 | else |
| 6080 | case $PKG_CONFIG in | 6072 | case $PKG_CONFIG in |
| @@ -6278,7 +6270,7 @@ fi | |||
| 6278 | for ac_header in term.h | 6270 | for ac_header in term.h |
| 6279 | do : | 6271 | do : |
| 6280 | ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h" | 6272 | ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h" |
| 6281 | if test "x$ac_cv_header_term_h" = xyes; then : | 6273 | if test "x$ac_cv_header_term_h" = x""yes; then : |
| 6282 | cat >>confdefs.h <<_ACEOF | 6274 | cat >>confdefs.h <<_ACEOF |
| 6283 | #define HAVE_TERM_H 1 | 6275 | #define HAVE_TERM_H 1 |
| 6284 | _ACEOF | 6276 | _ACEOF |
| @@ -6289,7 +6281,7 @@ done | |||
| 6289 | 6281 | ||
| 6290 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | 6282 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
| 6291 | $as_echo_n "checking for ANSI C header files... " >&6; } | 6283 | $as_echo_n "checking for ANSI C header files... " >&6; } |
| 6292 | if ${ac_cv_header_stdc+:} false; then : | 6284 | if test "${ac_cv_header_stdc+set}" = set; then : |
| 6293 | $as_echo_n "(cached) " >&6 | 6285 | $as_echo_n "(cached) " >&6 |
| 6294 | else | 6286 | else |
| 6295 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6287 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6401,7 +6393,7 @@ fi | |||
| 6401 | 6393 | ||
| 6402 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 | 6394 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 |
| 6403 | $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } | 6395 | $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } |
| 6404 | if ${ac_cv_header_time+:} false; then : | 6396 | if test "${ac_cv_header_time+set}" = set; then : |
| 6405 | $as_echo_n "(cached) " >&6 | 6397 | $as_echo_n "(cached) " >&6 |
| 6406 | else | 6398 | else |
| 6407 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6399 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6435,7 +6427,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h | |||
| 6435 | fi | 6427 | fi |
| 6436 | 6428 | ||
| 6437 | ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default" | 6429 | ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default" |
| 6438 | if test "x$ac_cv_have_decl_sys_siglist" = xyes; then : | 6430 | if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then : |
| 6439 | ac_have_decl=1 | 6431 | ac_have_decl=1 |
| 6440 | else | 6432 | else |
| 6441 | ac_have_decl=0 | 6433 | ac_have_decl=0 |
| @@ -6448,7 +6440,7 @@ _ACEOF | |||
| 6448 | if test $ac_cv_have_decl_sys_siglist != yes; then | 6440 | if test $ac_cv_have_decl_sys_siglist != yes; then |
| 6449 | # For Tru64, at least: | 6441 | # For Tru64, at least: |
| 6450 | ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default" | 6442 | ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default" |
| 6451 | if test "x$ac_cv_have_decl___sys_siglist" = xyes; then : | 6443 | if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then : |
| 6452 | ac_have_decl=1 | 6444 | ac_have_decl=1 |
| 6453 | else | 6445 | else |
| 6454 | ac_have_decl=0 | 6446 | ac_have_decl=0 |
| @@ -6466,7 +6458,7 @@ $as_echo "#define sys_siglist __sys_siglist" >>confdefs.h | |||
| 6466 | fi | 6458 | fi |
| 6467 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 | 6459 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 |
| 6468 | $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } | 6460 | $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } |
| 6469 | if ${ac_cv_header_sys_wait_h+:} false; then : | 6461 | if test "${ac_cv_header_sys_wait_h+set}" = set; then : |
| 6470 | $as_echo_n "(cached) " >&6 | 6462 | $as_echo_n "(cached) " >&6 |
| 6471 | else | 6463 | else |
| 6472 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6464 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6508,7 +6500,7 @@ fi | |||
| 6508 | 6500 | ||
| 6509 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5 | 6501 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5 |
| 6510 | $as_echo_n "checking for struct utimbuf... " >&6; } | 6502 | $as_echo_n "checking for struct utimbuf... " >&6; } |
| 6511 | if ${emacs_cv_struct_utimbuf+:} false; then : | 6503 | if test "${emacs_cv_struct_utimbuf+set}" = set; then : |
| 6512 | $as_echo_n "(cached) " >&6 | 6504 | $as_echo_n "(cached) " >&6 |
| 6513 | else | 6505 | else |
| 6514 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6506 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6551,7 +6543,7 @@ fi | |||
| 6551 | 6543 | ||
| 6552 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 | 6544 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 |
| 6553 | $as_echo_n "checking return type of signal handlers... " >&6; } | 6545 | $as_echo_n "checking return type of signal handlers... " >&6; } |
| 6554 | if ${ac_cv_type_signal+:} false; then : | 6546 | if test "${ac_cv_type_signal+set}" = set; then : |
| 6555 | $as_echo_n "(cached) " >&6 | 6547 | $as_echo_n "(cached) " >&6 |
| 6556 | else | 6548 | else |
| 6557 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6549 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6585,7 +6577,7 @@ _ACEOF | |||
| 6585 | 6577 | ||
| 6586 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 | 6578 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 |
| 6587 | $as_echo_n "checking for speed_t... " >&6; } | 6579 | $as_echo_n "checking for speed_t... " >&6; } |
| 6588 | if ${emacs_cv_speed_t+:} false; then : | 6580 | if test "${emacs_cv_speed_t+set}" = set; then : |
| 6589 | $as_echo_n "(cached) " >&6 | 6581 | $as_echo_n "(cached) " >&6 |
| 6590 | else | 6582 | else |
| 6591 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6583 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6616,7 +6608,7 @@ fi | |||
| 6616 | 6608 | ||
| 6617 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 | 6609 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 |
| 6618 | $as_echo_n "checking for struct timeval... " >&6; } | 6610 | $as_echo_n "checking for struct timeval... " >&6; } |
| 6619 | if ${emacs_cv_struct_timeval+:} false; then : | 6611 | if test "${emacs_cv_struct_timeval+set}" = set; then : |
| 6620 | $as_echo_n "(cached) " >&6 | 6612 | $as_echo_n "(cached) " >&6 |
| 6621 | else | 6613 | else |
| 6622 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6614 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6657,7 +6649,7 @@ fi | |||
| 6657 | 6649 | ||
| 6658 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5 | 6650 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5 |
| 6659 | $as_echo_n "checking for struct exception... " >&6; } | 6651 | $as_echo_n "checking for struct exception... " >&6; } |
| 6660 | if ${emacs_cv_struct_exception+:} false; then : | 6652 | if test "${emacs_cv_struct_exception+set}" = set; then : |
| 6661 | $as_echo_n "(cached) " >&6 | 6653 | $as_echo_n "(cached) " >&6 |
| 6662 | else | 6654 | else |
| 6663 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6655 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6690,7 +6682,7 @@ fi | |||
| 6690 | for ac_header in sys/socket.h | 6682 | for ac_header in sys/socket.h |
| 6691 | do : | 6683 | do : |
| 6692 | ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" | 6684 | ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" |
| 6693 | if test "x$ac_cv_header_sys_socket_h" = xyes; then : | 6685 | if test "x$ac_cv_header_sys_socket_h" = x""yes; then : |
| 6694 | cat >>confdefs.h <<_ACEOF | 6686 | cat >>confdefs.h <<_ACEOF |
| 6695 | #define HAVE_SYS_SOCKET_H 1 | 6687 | #define HAVE_SYS_SOCKET_H 1 |
| 6696 | _ACEOF | 6688 | _ACEOF |
| @@ -6706,7 +6698,7 @@ do : | |||
| 6706 | #include <sys/socket.h> | 6698 | #include <sys/socket.h> |
| 6707 | #endif | 6699 | #endif |
| 6708 | " | 6700 | " |
| 6709 | if test "x$ac_cv_header_net_if_h" = xyes; then : | 6701 | if test "x$ac_cv_header_net_if_h" = x""yes; then : |
| 6710 | cat >>confdefs.h <<_ACEOF | 6702 | cat >>confdefs.h <<_ACEOF |
| 6711 | #define HAVE_NET_IF_H 1 | 6703 | #define HAVE_NET_IF_H 1 |
| 6712 | _ACEOF | 6704 | _ACEOF |
| @@ -6718,7 +6710,7 @@ done | |||
| 6718 | 6710 | ||
| 6719 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 | 6711 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 |
| 6720 | $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } | 6712 | $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } |
| 6721 | if ${ac_cv_struct_tm+:} false; then : | 6713 | if test "${ac_cv_struct_tm+set}" = set; then : |
| 6722 | $as_echo_n "(cached) " >&6 | 6714 | $as_echo_n "(cached) " >&6 |
| 6723 | else | 6715 | else |
| 6724 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6716 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6755,7 +6747,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_ | |||
| 6755 | #include <$ac_cv_struct_tm> | 6747 | #include <$ac_cv_struct_tm> |
| 6756 | 6748 | ||
| 6757 | " | 6749 | " |
| 6758 | if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : | 6750 | if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : |
| 6759 | 6751 | ||
| 6760 | cat >>confdefs.h <<_ACEOF | 6752 | cat >>confdefs.h <<_ACEOF |
| 6761 | #define HAVE_STRUCT_TM_TM_ZONE 1 | 6753 | #define HAVE_STRUCT_TM_TM_ZONE 1 |
| @@ -6771,7 +6763,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h | |||
| 6771 | else | 6763 | else |
| 6772 | ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h> | 6764 | ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h> |
| 6773 | " | 6765 | " |
| 6774 | if test "x$ac_cv_have_decl_tzname" = xyes; then : | 6766 | if test "x$ac_cv_have_decl_tzname" = x""yes; then : |
| 6775 | ac_have_decl=1 | 6767 | ac_have_decl=1 |
| 6776 | else | 6768 | else |
| 6777 | ac_have_decl=0 | 6769 | ac_have_decl=0 |
| @@ -6783,7 +6775,7 @@ _ACEOF | |||
| 6783 | 6775 | ||
| 6784 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 | 6776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 |
| 6785 | $as_echo_n "checking for tzname... " >&6; } | 6777 | $as_echo_n "checking for tzname... " >&6; } |
| 6786 | if ${ac_cv_var_tzname+:} false; then : | 6778 | if test "${ac_cv_var_tzname+set}" = set; then : |
| 6787 | $as_echo_n "(cached) " >&6 | 6779 | $as_echo_n "(cached) " >&6 |
| 6788 | else | 6780 | else |
| 6789 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6781 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6820,7 +6812,7 @@ fi | |||
| 6820 | 6812 | ||
| 6821 | ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h> | 6813 | ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h> |
| 6822 | " | 6814 | " |
| 6823 | if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then : | 6815 | if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then : |
| 6824 | 6816 | ||
| 6825 | $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h | 6817 | $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h |
| 6826 | 6818 | ||
| @@ -6834,7 +6826,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_flags" "ac_cv_member_struct_i | |||
| 6834 | #include <net/if.h> | 6826 | #include <net/if.h> |
| 6835 | #endif | 6827 | #endif |
| 6836 | " | 6828 | " |
| 6837 | if test "x$ac_cv_member_struct_ifreq_ifr_flags" = xyes; then : | 6829 | if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then : |
| 6838 | 6830 | ||
| 6839 | cat >>confdefs.h <<_ACEOF | 6831 | cat >>confdefs.h <<_ACEOF |
| 6840 | #define HAVE_STRUCT_IFREQ_IFR_FLAGS 1 | 6832 | #define HAVE_STRUCT_IFREQ_IFR_FLAGS 1 |
| @@ -6850,7 +6842,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ | |||
| 6850 | #include <net/if.h> | 6842 | #include <net/if.h> |
| 6851 | #endif | 6843 | #endif |
| 6852 | " | 6844 | " |
| 6853 | if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then : | 6845 | if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then : |
| 6854 | 6846 | ||
| 6855 | cat >>confdefs.h <<_ACEOF | 6847 | cat >>confdefs.h <<_ACEOF |
| 6856 | #define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 | 6848 | #define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 |
| @@ -6866,7 +6858,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_netmask" "ac_cv_member_struct | |||
| 6866 | #include <net/if.h> | 6858 | #include <net/if.h> |
| 6867 | #endif | 6859 | #endif |
| 6868 | " | 6860 | " |
| 6869 | if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = xyes; then : | 6861 | if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then : |
| 6870 | 6862 | ||
| 6871 | cat >>confdefs.h <<_ACEOF | 6863 | cat >>confdefs.h <<_ACEOF |
| 6872 | #define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 | 6864 | #define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 |
| @@ -6882,7 +6874,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_broadaddr" "ac_cv_member_stru | |||
| 6882 | #include <net/if.h> | 6874 | #include <net/if.h> |
| 6883 | #endif | 6875 | #endif |
| 6884 | " | 6876 | " |
| 6885 | if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = xyes; then : | 6877 | if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then : |
| 6886 | 6878 | ||
| 6887 | cat >>confdefs.h <<_ACEOF | 6879 | cat >>confdefs.h <<_ACEOF |
| 6888 | #define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 | 6880 | #define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 |
| @@ -6898,7 +6890,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_addr" "ac_cv_member_struct_if | |||
| 6898 | #include <net/if.h> | 6890 | #include <net/if.h> |
| 6899 | #endif | 6891 | #endif |
| 6900 | " | 6892 | " |
| 6901 | if test "x$ac_cv_member_struct_ifreq_ifr_addr" = xyes; then : | 6893 | if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then : |
| 6902 | 6894 | ||
| 6903 | cat >>confdefs.h <<_ACEOF | 6895 | cat >>confdefs.h <<_ACEOF |
| 6904 | #define HAVE_STRUCT_IFREQ_IFR_ADDR 1 | 6896 | #define HAVE_STRUCT_IFREQ_IFR_ADDR 1 |
| @@ -6927,7 +6919,7 @@ fi | |||
| 6927 | 6919 | ||
| 6928 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 | 6920 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 |
| 6929 | $as_echo_n "checking for working volatile... " >&6; } | 6921 | $as_echo_n "checking for working volatile... " >&6; } |
| 6930 | if ${ac_cv_c_volatile+:} false; then : | 6922 | if test "${ac_cv_c_volatile+set}" = set; then : |
| 6931 | $as_echo_n "(cached) " >&6 | 6923 | $as_echo_n "(cached) " >&6 |
| 6932 | else | 6924 | else |
| 6933 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6925 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -6961,7 +6953,7 @@ fi | |||
| 6961 | 6953 | ||
| 6962 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 | 6954 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 |
| 6963 | $as_echo_n "checking for an ANSI C-conforming const... " >&6; } | 6955 | $as_echo_n "checking for an ANSI C-conforming const... " >&6; } |
| 6964 | if ${ac_cv_c_const+:} false; then : | 6956 | if test "${ac_cv_c_const+set}" = set; then : |
| 6965 | $as_echo_n "(cached) " >&6 | 6957 | $as_echo_n "(cached) " >&6 |
| 6966 | else | 6958 | else |
| 6967 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6959 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -7041,7 +7033,7 @@ fi | |||
| 7041 | 7033 | ||
| 7042 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5 | 7034 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5 |
| 7043 | $as_echo_n "checking for void * support... " >&6; } | 7035 | $as_echo_n "checking for void * support... " >&6; } |
| 7044 | if ${emacs_cv_void_star+:} false; then : | 7036 | if test "${emacs_cv_void_star+set}" = set; then : |
| 7045 | $as_echo_n "(cached) " >&6 | 7037 | $as_echo_n "(cached) " >&6 |
| 7046 | else | 7038 | else |
| 7047 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 7039 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -7074,7 +7066,7 @@ fi | |||
| 7074 | 7066 | ||
| 7075 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 | 7067 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 |
| 7076 | $as_echo_n "checking whether byte ordering is bigendian... " >&6; } | 7068 | $as_echo_n "checking whether byte ordering is bigendian... " >&6; } |
| 7077 | if ${ac_cv_c_bigendian+:} false; then : | 7069 | if test "${ac_cv_c_bigendian+set}" = set; then : |
| 7078 | $as_echo_n "(cached) " >&6 | 7070 | $as_echo_n "(cached) " >&6 |
| 7079 | else | 7071 | else |
| 7080 | ac_cv_c_bigendian=unknown | 7072 | ac_cv_c_bigendian=unknown |
| @@ -7293,7 +7285,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h | |||
| 7293 | ;; #( | 7285 | ;; #( |
| 7294 | *) | 7286 | *) |
| 7295 | as_fn_error $? "unknown endianness | 7287 | as_fn_error $? "unknown endianness |
| 7296 | presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; | 7288 | presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; |
| 7297 | esac | 7289 | esac |
| 7298 | 7290 | ||
| 7299 | 7291 | ||
| @@ -7301,7 +7293,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h | |||
| 7301 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | 7293 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
| 7302 | set x ${MAKE-make} | 7294 | set x ${MAKE-make} |
| 7303 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 7295 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
| 7304 | if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : | 7296 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
| 7305 | $as_echo_n "(cached) " >&6 | 7297 | $as_echo_n "(cached) " >&6 |
| 7306 | else | 7298 | else |
| 7307 | cat >conftest.make <<\_ACEOF | 7299 | cat >conftest.make <<\_ACEOF |
| @@ -7389,7 +7381,7 @@ deps_frag=$srcdir/src/$deps_frag | |||
| 7389 | 7381 | ||
| 7390 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 | 7382 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 |
| 7391 | $as_echo_n "checking for long file names... " >&6; } | 7383 | $as_echo_n "checking for long file names... " >&6; } |
| 7392 | if ${ac_cv_sys_long_file_names+:} false; then : | 7384 | if test "${ac_cv_sys_long_file_names+set}" = set; then : |
| 7393 | $as_echo_n "(cached) " >&6 | 7385 | $as_echo_n "(cached) " >&6 |
| 7394 | else | 7386 | else |
| 7395 | ac_cv_sys_long_file_names=yes | 7387 | ac_cv_sys_long_file_names=yes |
| @@ -7445,8 +7437,8 @@ if test "x$with_x" = xno; then | |||
| 7445 | have_x=disabled | 7437 | have_x=disabled |
| 7446 | else | 7438 | else |
| 7447 | case $x_includes,$x_libraries in #( | 7439 | case $x_includes,$x_libraries in #( |
| 7448 | *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( | 7440 | *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( |
| 7449 | *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : | 7441 | *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : |
| 7450 | $as_echo_n "(cached) " >&6 | 7442 | $as_echo_n "(cached) " >&6 |
| 7451 | else | 7443 | else |
| 7452 | # One or both of the vars are not set, and there is no cached value. | 7444 | # One or both of the vars are not set, and there is no cached value. |
| @@ -7729,7 +7721,7 @@ if test "${with_ns}" != no; then | |||
| 7729 | TEMACS_LDFLAGS2= | 7721 | TEMACS_LDFLAGS2= |
| 7730 | fi | 7722 | fi |
| 7731 | ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default" | 7723 | ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default" |
| 7732 | if test "x$ac_cv_header_AppKit_AppKit_h" = xyes; then : | 7724 | if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then : |
| 7733 | HAVE_NS=yes | 7725 | HAVE_NS=yes |
| 7734 | else | 7726 | else |
| 7735 | as_fn_error $? "\`--with-ns' was specified, but the include | 7727 | as_fn_error $? "\`--with-ns' was specified, but the include |
| @@ -7811,7 +7803,7 @@ if test "$window_system" = none && test "X$with_x" != "Xno"; then | |||
| 7811 | set dummy X; ac_word=$2 | 7803 | set dummy X; ac_word=$2 |
| 7812 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 7804 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7813 | $as_echo_n "checking for $ac_word... " >&6; } | 7805 | $as_echo_n "checking for $ac_word... " >&6; } |
| 7814 | if ${ac_cv_prog_HAVE_XSERVER+:} false; then : | 7806 | if test "${ac_cv_prog_HAVE_XSERVER+set}" = set; then : |
| 7815 | $as_echo_n "(cached) " >&6 | 7807 | $as_echo_n "(cached) " >&6 |
| 7816 | else | 7808 | else |
| 7817 | if test -n "$HAVE_XSERVER"; then | 7809 | if test -n "$HAVE_XSERVER"; then |
| @@ -7870,14 +7862,14 @@ esac | |||
| 7870 | GNU_MALLOC=yes | 7862 | GNU_MALLOC=yes |
| 7871 | doug_lea_malloc=yes | 7863 | doug_lea_malloc=yes |
| 7872 | ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state" | 7864 | ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state" |
| 7873 | if test "x$ac_cv_func_malloc_get_state" = xyes; then : | 7865 | if test "x$ac_cv_func_malloc_get_state" = x""yes; then : |
| 7874 | 7866 | ||
| 7875 | else | 7867 | else |
| 7876 | doug_lea_malloc=no | 7868 | doug_lea_malloc=no |
| 7877 | fi | 7869 | fi |
| 7878 | 7870 | ||
| 7879 | ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" | 7871 | ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" |
| 7880 | if test "x$ac_cv_func_malloc_set_state" = xyes; then : | 7872 | if test "x$ac_cv_func_malloc_set_state" = x""yes; then : |
| 7881 | 7873 | ||
| 7882 | else | 7874 | else |
| 7883 | doug_lea_malloc=no | 7875 | doug_lea_malloc=no |
| @@ -7885,7 +7877,7 @@ fi | |||
| 7885 | 7877 | ||
| 7886 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 | 7878 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 |
| 7887 | $as_echo_n "checking whether __after_morecore_hook exists... " >&6; } | 7879 | $as_echo_n "checking whether __after_morecore_hook exists... " >&6; } |
| 7888 | if ${emacs_cv_var___after_morecore_hook+:} false; then : | 7880 | if test "${emacs_cv_var___after_morecore_hook+set}" = set; then : |
| 7889 | $as_echo_n "(cached) " >&6 | 7881 | $as_echo_n "(cached) " >&6 |
| 7890 | else | 7882 | else |
| 7891 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 7883 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -7990,7 +7982,7 @@ done | |||
| 7990 | for ac_func in getpagesize | 7982 | for ac_func in getpagesize |
| 7991 | do : | 7983 | do : |
| 7992 | ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" | 7984 | ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" |
| 7993 | if test "x$ac_cv_func_getpagesize" = xyes; then : | 7985 | if test "x$ac_cv_func_getpagesize" = x""yes; then : |
| 7994 | cat >>confdefs.h <<_ACEOF | 7986 | cat >>confdefs.h <<_ACEOF |
| 7995 | #define HAVE_GETPAGESIZE 1 | 7987 | #define HAVE_GETPAGESIZE 1 |
| 7996 | _ACEOF | 7988 | _ACEOF |
| @@ -8000,7 +7992,7 @@ done | |||
| 8000 | 7992 | ||
| 8001 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 | 7993 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 |
| 8002 | $as_echo_n "checking for working mmap... " >&6; } | 7994 | $as_echo_n "checking for working mmap... " >&6; } |
| 8003 | if ${ac_cv_func_mmap_fixed_mapped+:} false; then : | 7995 | if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : |
| 8004 | $as_echo_n "(cached) " >&6 | 7996 | $as_echo_n "(cached) " >&6 |
| 8005 | else | 7997 | else |
| 8006 | if test "$cross_compiling" = yes; then : | 7998 | if test "$cross_compiling" = yes; then : |
| @@ -8175,7 +8167,7 @@ LIBS="$LIBS_SYSTEM $LIBS" | |||
| 8175 | 8167 | ||
| 8176 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 | 8168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 |
| 8177 | $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } | 8169 | $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } |
| 8178 | if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : | 8170 | if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : |
| 8179 | $as_echo_n "(cached) " >&6 | 8171 | $as_echo_n "(cached) " >&6 |
| 8180 | else | 8172 | else |
| 8181 | ac_check_lib_save_LIBS=$LIBS | 8173 | ac_check_lib_save_LIBS=$LIBS |
| @@ -8209,7 +8201,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 8209 | fi | 8201 | fi |
| 8210 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 | 8202 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 |
| 8211 | $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } | 8203 | $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } |
| 8212 | if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : | 8204 | if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : |
| 8213 | cat >>confdefs.h <<_ACEOF | 8205 | cat >>confdefs.h <<_ACEOF |
| 8214 | #define HAVE_LIBDNET 1 | 8206 | #define HAVE_LIBDNET 1 |
| 8215 | _ACEOF | 8207 | _ACEOF |
| @@ -8221,7 +8213,7 @@ fi | |||
| 8221 | 8213 | ||
| 8222 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5 | 8214 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5 |
| 8223 | $as_echo_n "checking for main in -lXbsd... " >&6; } | 8215 | $as_echo_n "checking for main in -lXbsd... " >&6; } |
| 8224 | if ${ac_cv_lib_Xbsd_main+:} false; then : | 8216 | if test "${ac_cv_lib_Xbsd_main+set}" = set; then : |
| 8225 | $as_echo_n "(cached) " >&6 | 8217 | $as_echo_n "(cached) " >&6 |
| 8226 | else | 8218 | else |
| 8227 | ac_check_lib_save_LIBS=$LIBS | 8219 | ac_check_lib_save_LIBS=$LIBS |
| @@ -8249,14 +8241,14 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 8249 | fi | 8241 | fi |
| 8250 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5 | 8242 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5 |
| 8251 | $as_echo "$ac_cv_lib_Xbsd_main" >&6; } | 8243 | $as_echo "$ac_cv_lib_Xbsd_main" >&6; } |
| 8252 | if test "x$ac_cv_lib_Xbsd_main" = xyes; then : | 8244 | if test "x$ac_cv_lib_Xbsd_main" = x""yes; then : |
| 8253 | LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" | 8245 | LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" |
| 8254 | fi | 8246 | fi |
| 8255 | 8247 | ||
| 8256 | 8248 | ||
| 8257 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5 | 8249 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5 |
| 8258 | $as_echo_n "checking for cma_open in -lpthreads... " >&6; } | 8250 | $as_echo_n "checking for cma_open in -lpthreads... " >&6; } |
| 8259 | if ${ac_cv_lib_pthreads_cma_open+:} false; then : | 8251 | if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then : |
| 8260 | $as_echo_n "(cached) " >&6 | 8252 | $as_echo_n "(cached) " >&6 |
| 8261 | else | 8253 | else |
| 8262 | ac_check_lib_save_LIBS=$LIBS | 8254 | ac_check_lib_save_LIBS=$LIBS |
| @@ -8290,7 +8282,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 8290 | fi | 8282 | fi |
| 8291 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5 | 8283 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5 |
| 8292 | $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; } | 8284 | $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; } |
| 8293 | if test "x$ac_cv_lib_pthreads_cma_open" = xyes; then : | 8285 | if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then : |
| 8294 | cat >>confdefs.h <<_ACEOF | 8286 | cat >>confdefs.h <<_ACEOF |
| 8295 | #define HAVE_LIBPTHREADS 1 | 8287 | #define HAVE_LIBPTHREADS 1 |
| 8296 | _ACEOF | 8288 | _ACEOF |
| @@ -8317,7 +8309,7 @@ case ${host_os} in | |||
| 8317 | aix*) | 8309 | aix*) |
| 8318 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5 | 8310 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5 |
| 8319 | $as_echo_n "checking for -bbigtoc option... " >&6; } | 8311 | $as_echo_n "checking for -bbigtoc option... " >&6; } |
| 8320 | if ${gdb_cv_bigtoc+:} false; then : | 8312 | if test "${gdb_cv_bigtoc+set}" = set; then : |
| 8321 | $as_echo_n "(cached) " >&6 | 8313 | $as_echo_n "(cached) " >&6 |
| 8322 | else | 8314 | else |
| 8323 | 8315 | ||
| @@ -8491,7 +8483,7 @@ fi | |||
| 8491 | if test "${window_system}" = "x11"; then | 8483 | if test "${window_system}" = "x11"; then |
| 8492 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5 | 8484 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5 |
| 8493 | $as_echo_n "checking X11 version 6... " >&6; } | 8485 | $as_echo_n "checking X11 version 6... " >&6; } |
| 8494 | if ${emacs_cv_x11_version_6+:} false; then : | 8486 | if test "${emacs_cv_x11_version_6+set}" = set; then : |
| 8495 | $as_echo_n "(cached) " >&6 | 8487 | $as_echo_n "(cached) " >&6 |
| 8496 | else | 8488 | else |
| 8497 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 8489 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -8556,7 +8548,7 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then | |||
| 8556 | set dummy pkg-config; ac_word=$2 | 8548 | set dummy pkg-config; ac_word=$2 |
| 8557 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8549 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8558 | $as_echo_n "checking for $ac_word... " >&6; } | 8550 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8559 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 8551 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 8560 | $as_echo_n "(cached) " >&6 | 8552 | $as_echo_n "(cached) " >&6 |
| 8561 | else | 8553 | else |
| 8562 | case $PKG_CONFIG in | 8554 | case $PKG_CONFIG in |
| @@ -8667,7 +8659,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 8667 | set dummy pkg-config; ac_word=$2 | 8659 | set dummy pkg-config; ac_word=$2 |
| 8668 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8660 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8669 | $as_echo_n "checking for $ac_word... " >&6; } | 8661 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8670 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 8662 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 8671 | $as_echo_n "(cached) " >&6 | 8663 | $as_echo_n "(cached) " >&6 |
| 8672 | else | 8664 | else |
| 8673 | case $PKG_CONFIG in | 8665 | case $PKG_CONFIG in |
| @@ -8766,7 +8758,7 @@ $as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h | |||
| 8766 | for ac_func in MagickExportImagePixels | 8758 | for ac_func in MagickExportImagePixels |
| 8767 | do : | 8759 | do : |
| 8768 | ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels" | 8760 | ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels" |
| 8769 | if test "x$ac_cv_func_MagickExportImagePixels" = xyes; then : | 8761 | if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then : |
| 8770 | cat >>confdefs.h <<_ACEOF | 8762 | cat >>confdefs.h <<_ACEOF |
| 8771 | #define HAVE_MAGICKEXPORTIMAGEPIXELS 1 | 8763 | #define HAVE_MAGICKEXPORTIMAGEPIXELS 1 |
| 8772 | _ACEOF | 8764 | _ACEOF |
| @@ -8792,7 +8784,7 @@ if test "${with_gtk3}" = "yes"; then | |||
| 8792 | set dummy pkg-config; ac_word=$2 | 8784 | set dummy pkg-config; ac_word=$2 |
| 8793 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8785 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8794 | $as_echo_n "checking for $ac_word... " >&6; } | 8786 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8795 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 8787 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 8796 | $as_echo_n "(cached) " >&6 | 8788 | $as_echo_n "(cached) " >&6 |
| 8797 | else | 8789 | else |
| 8798 | case $PKG_CONFIG in | 8790 | case $PKG_CONFIG in |
| @@ -8898,7 +8890,7 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then | |||
| 8898 | set dummy pkg-config; ac_word=$2 | 8890 | set dummy pkg-config; ac_word=$2 |
| 8899 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8891 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8900 | $as_echo_n "checking for $ac_word... " >&6; } | 8892 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8901 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 8893 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 8902 | $as_echo_n "(cached) " >&6 | 8894 | $as_echo_n "(cached) " >&6 |
| 8903 | else | 8895 | else |
| 8904 | case $PKG_CONFIG in | 8896 | case $PKG_CONFIG in |
| @@ -9003,7 +8995,7 @@ if test x"$pkg_check_gtk" = xyes; then | |||
| 9003 | for ac_func in gtk_main | 8995 | for ac_func in gtk_main |
| 9004 | do : | 8996 | do : |
| 9005 | ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main" | 8997 | ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main" |
| 9006 | if test "x$ac_cv_func_gtk_main" = xyes; then : | 8998 | if test "x$ac_cv_func_gtk_main" = x""yes; then : |
| 9007 | cat >>confdefs.h <<_ACEOF | 8999 | cat >>confdefs.h <<_ACEOF |
| 9008 | #define HAVE_GTK_MAIN 1 | 9000 | #define HAVE_GTK_MAIN 1 |
| 9009 | _ACEOF | 9001 | _ACEOF |
| @@ -9013,7 +9005,7 @@ done | |||
| 9013 | 9005 | ||
| 9014 | if test "${GTK_COMPILES}" != "yes"; then | 9006 | if test "${GTK_COMPILES}" != "yes"; then |
| 9015 | if test "$USE_X_TOOLKIT" != "maybe"; then | 9007 | if test "$USE_X_TOOLKIT" != "maybe"; then |
| 9016 | as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; | 9008 | as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5 ; |
| 9017 | fi | 9009 | fi |
| 9018 | else | 9010 | else |
| 9019 | HAVE_GTK=yes | 9011 | HAVE_GTK=yes |
| @@ -9051,7 +9043,7 @@ if test "${HAVE_GTK}" = "yes"; then | |||
| 9051 | ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION" "ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default | 9043 | ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION" "ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default |
| 9052 | #include <gtk/gtk.h> | 9044 | #include <gtk/gtk.h> |
| 9053 | " | 9045 | " |
| 9054 | if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = xyes; then : | 9046 | if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then : |
| 9055 | HAVE_GTK_FILE_SELECTION=yes | 9047 | HAVE_GTK_FILE_SELECTION=yes |
| 9056 | else | 9048 | else |
| 9057 | HAVE_GTK_FILE_SELECTION=no | 9049 | HAVE_GTK_FILE_SELECTION=no |
| @@ -9061,7 +9053,7 @@ fi | |||
| 9061 | for ac_func in gtk_file_selection_new | 9053 | for ac_func in gtk_file_selection_new |
| 9062 | do : | 9054 | do : |
| 9063 | ac_fn_c_check_func "$LINENO" "gtk_file_selection_new" "ac_cv_func_gtk_file_selection_new" | 9055 | ac_fn_c_check_func "$LINENO" "gtk_file_selection_new" "ac_cv_func_gtk_file_selection_new" |
| 9064 | if test "x$ac_cv_func_gtk_file_selection_new" = xyes; then : | 9056 | if test "x$ac_cv_func_gtk_file_selection_new" = x""yes; then : |
| 9065 | cat >>confdefs.h <<_ACEOF | 9057 | cat >>confdefs.h <<_ACEOF |
| 9066 | #define HAVE_GTK_FILE_SELECTION_NEW 1 | 9058 | #define HAVE_GTK_FILE_SELECTION_NEW 1 |
| 9067 | _ACEOF | 9059 | _ACEOF |
| @@ -9075,7 +9067,7 @@ done | |||
| 9075 | for ac_header in pthread.h | 9067 | for ac_header in pthread.h |
| 9076 | do : | 9068 | do : |
| 9077 | ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" | 9069 | ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" |
| 9078 | if test "x$ac_cv_header_pthread_h" = xyes; then : | 9070 | if test "x$ac_cv_header_pthread_h" = x""yes; then : |
| 9079 | cat >>confdefs.h <<_ACEOF | 9071 | cat >>confdefs.h <<_ACEOF |
| 9080 | #define HAVE_PTHREAD_H 1 | 9072 | #define HAVE_PTHREAD_H 1 |
| 9081 | _ACEOF | 9073 | _ACEOF |
| @@ -9087,7 +9079,7 @@ done | |||
| 9087 | if test "$ac_cv_header_pthread_h"; then | 9079 | if test "$ac_cv_header_pthread_h"; then |
| 9088 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5 | 9080 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5 |
| 9089 | $as_echo_n "checking for pthread_self in -lpthread... " >&6; } | 9081 | $as_echo_n "checking for pthread_self in -lpthread... " >&6; } |
| 9090 | if ${ac_cv_lib_pthread_pthread_self+:} false; then : | 9082 | if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then : |
| 9091 | $as_echo_n "(cached) " >&6 | 9083 | $as_echo_n "(cached) " >&6 |
| 9092 | else | 9084 | else |
| 9093 | ac_check_lib_save_LIBS=$LIBS | 9085 | ac_check_lib_save_LIBS=$LIBS |
| @@ -9121,7 +9113,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 9121 | fi | 9113 | fi |
| 9122 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5 | 9114 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5 |
| 9123 | $as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } | 9115 | $as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } |
| 9124 | if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then : | 9116 | if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then : |
| 9125 | HAVE_GTK_AND_PTHREAD=yes | 9117 | HAVE_GTK_AND_PTHREAD=yes |
| 9126 | fi | 9118 | fi |
| 9127 | 9119 | ||
| @@ -9164,7 +9156,7 @@ if test "${with_dbus}" = "yes"; then | |||
| 9164 | set dummy pkg-config; ac_word=$2 | 9156 | set dummy pkg-config; ac_word=$2 |
| 9165 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 9157 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 9166 | $as_echo_n "checking for $ac_word... " >&6; } | 9158 | $as_echo_n "checking for $ac_word... " >&6; } |
| 9167 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 9159 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 9168 | $as_echo_n "(cached) " >&6 | 9160 | $as_echo_n "(cached) " >&6 |
| 9169 | else | 9161 | else |
| 9170 | case $PKG_CONFIG in | 9162 | case $PKG_CONFIG in |
| @@ -9259,7 +9251,7 @@ $as_echo "#define HAVE_DBUS 1" >>confdefs.h | |||
| 9259 | for ac_func in dbus_watch_get_unix_fd | 9251 | for ac_func in dbus_watch_get_unix_fd |
| 9260 | do : | 9252 | do : |
| 9261 | ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd" | 9253 | ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd" |
| 9262 | if test "x$ac_cv_func_dbus_watch_get_unix_fd" = xyes; then : | 9254 | if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then : |
| 9263 | cat >>confdefs.h <<_ACEOF | 9255 | cat >>confdefs.h <<_ACEOF |
| 9264 | #define HAVE_DBUS_WATCH_GET_UNIX_FD 1 | 9256 | #define HAVE_DBUS_WATCH_GET_UNIX_FD 1 |
| 9265 | _ACEOF | 9257 | _ACEOF |
| @@ -9281,7 +9273,7 @@ if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then | |||
| 9281 | set dummy pkg-config; ac_word=$2 | 9273 | set dummy pkg-config; ac_word=$2 |
| 9282 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 9274 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 9283 | $as_echo_n "checking for $ac_word... " >&6; } | 9275 | $as_echo_n "checking for $ac_word... " >&6; } |
| 9284 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 9276 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 9285 | $as_echo_n "(cached) " >&6 | 9277 | $as_echo_n "(cached) " >&6 |
| 9286 | else | 9278 | else |
| 9287 | case $PKG_CONFIG in | 9279 | case $PKG_CONFIG in |
| @@ -9380,7 +9372,7 @@ LIBSELINUX_LIBS= | |||
| 9380 | if test "${with_selinux}" = "yes"; then | 9372 | if test "${with_selinux}" = "yes"; then |
| 9381 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5 | 9373 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5 |
| 9382 | $as_echo_n "checking for lgetfilecon in -lselinux... " >&6; } | 9374 | $as_echo_n "checking for lgetfilecon in -lselinux... " >&6; } |
| 9383 | if ${ac_cv_lib_selinux_lgetfilecon+:} false; then : | 9375 | if test "${ac_cv_lib_selinux_lgetfilecon+set}" = set; then : |
| 9384 | $as_echo_n "(cached) " >&6 | 9376 | $as_echo_n "(cached) " >&6 |
| 9385 | else | 9377 | else |
| 9386 | ac_check_lib_save_LIBS=$LIBS | 9378 | ac_check_lib_save_LIBS=$LIBS |
| @@ -9414,7 +9406,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 9414 | fi | 9406 | fi |
| 9415 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_lgetfilecon" >&5 | 9407 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_lgetfilecon" >&5 |
| 9416 | $as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; } | 9408 | $as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; } |
| 9417 | if test "x$ac_cv_lib_selinux_lgetfilecon" = xyes; then : | 9409 | if test "x$ac_cv_lib_selinux_lgetfilecon" = x""yes; then : |
| 9418 | HAVE_LIBSELINUX=yes | 9410 | HAVE_LIBSELINUX=yes |
| 9419 | else | 9411 | else |
| 9420 | HAVE_LIBSELINUX=no | 9412 | HAVE_LIBSELINUX=no |
| @@ -9438,7 +9430,7 @@ if test "${with_gnutls}" = "yes" ; then | |||
| 9438 | set dummy pkg-config; ac_word=$2 | 9430 | set dummy pkg-config; ac_word=$2 |
| 9439 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 9431 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 9440 | $as_echo_n "checking for $ac_word... " >&6; } | 9432 | $as_echo_n "checking for $ac_word... " >&6; } |
| 9441 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 9433 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 9442 | $as_echo_n "(cached) " >&6 | 9434 | $as_echo_n "(cached) " >&6 |
| 9443 | else | 9435 | else |
| 9444 | case $PKG_CONFIG in | 9436 | case $PKG_CONFIG in |
| @@ -9540,7 +9532,7 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then | |||
| 9540 | if test "$with_xaw3d" != no; then | 9532 | if test "$with_xaw3d" != no; then |
| 9541 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5 | 9533 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5 |
| 9542 | $as_echo_n "checking for xaw3d... " >&6; } | 9534 | $as_echo_n "checking for xaw3d... " >&6; } |
| 9543 | if ${emacs_cv_xaw3d+:} false; then : | 9535 | if test "${emacs_cv_xaw3d+set}" = set; then : |
| 9544 | $as_echo_n "(cached) " >&6 | 9536 | $as_echo_n "(cached) " >&6 |
| 9545 | else | 9537 | else |
| 9546 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9538 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -9582,7 +9574,7 @@ $as_echo "#define HAVE_XAW3D 1" >>confdefs.h | |||
| 9582 | $as_echo "no" >&6; } | 9574 | $as_echo "no" >&6; } |
| 9583 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5 | 9575 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5 |
| 9584 | $as_echo_n "checking for libXaw... " >&6; } | 9576 | $as_echo_n "checking for libXaw... " >&6; } |
| 9585 | if ${emacs_cv_xaw+:} false; then : | 9577 | if test "${emacs_cv_xaw+set}" = set; then : |
| 9586 | $as_echo_n "(cached) " >&6 | 9578 | $as_echo_n "(cached) " >&6 |
| 9587 | else | 9579 | else |
| 9588 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9580 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -9628,7 +9620,7 @@ LIBXTR6= | |||
| 9628 | if test "${USE_X_TOOLKIT}" != "none"; then | 9620 | if test "${USE_X_TOOLKIT}" != "none"; then |
| 9629 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5 | 9621 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5 |
| 9630 | $as_echo_n "checking X11 toolkit version... " >&6; } | 9622 | $as_echo_n "checking X11 toolkit version... " >&6; } |
| 9631 | if ${emacs_cv_x11_toolkit_version_6+:} false; then : | 9623 | if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then : |
| 9632 | $as_echo_n "(cached) " >&6 | 9624 | $as_echo_n "(cached) " >&6 |
| 9633 | else | 9625 | else |
| 9634 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9626 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -9679,7 +9671,7 @@ $as_echo "before 6" >&6; } | |||
| 9679 | fi | 9671 | fi |
| 9680 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuConvertStandardSelection in -lXmu" >&5 | 9672 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuConvertStandardSelection in -lXmu" >&5 |
| 9681 | $as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; } | 9673 | $as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; } |
| 9682 | if ${ac_cv_lib_Xmu_XmuConvertStandardSelection+:} false; then : | 9674 | if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then : |
| 9683 | $as_echo_n "(cached) " >&6 | 9675 | $as_echo_n "(cached) " >&6 |
| 9684 | else | 9676 | else |
| 9685 | ac_check_lib_save_LIBS=$LIBS | 9677 | ac_check_lib_save_LIBS=$LIBS |
| @@ -9713,7 +9705,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 9713 | fi | 9705 | fi |
| 9714 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 | 9706 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 |
| 9715 | $as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } | 9707 | $as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } |
| 9716 | if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = xyes; then : | 9708 | if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then : |
| 9717 | cat >>confdefs.h <<_ACEOF | 9709 | cat >>confdefs.h <<_ACEOF |
| 9718 | #define HAVE_LIBXMU 1 | 9710 | #define HAVE_LIBXMU 1 |
| 9719 | _ACEOF | 9711 | _ACEOF |
| @@ -9740,7 +9732,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 9740 | if test "${USE_X_TOOLKIT}" != "none"; then | 9732 | if test "${USE_X_TOOLKIT}" != "none"; then |
| 9741 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 | 9733 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 |
| 9742 | $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } | 9734 | $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } |
| 9743 | if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : | 9735 | if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then : |
| 9744 | $as_echo_n "(cached) " >&6 | 9736 | $as_echo_n "(cached) " >&6 |
| 9745 | else | 9737 | else |
| 9746 | ac_check_lib_save_LIBS=$LIBS | 9738 | ac_check_lib_save_LIBS=$LIBS |
| @@ -9774,7 +9766,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 9774 | fi | 9766 | fi |
| 9775 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 | 9767 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 |
| 9776 | $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } | 9768 | $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } |
| 9777 | if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : | 9769 | if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then : |
| 9778 | cat >>confdefs.h <<_ACEOF | 9770 | cat >>confdefs.h <<_ACEOF |
| 9779 | #define HAVE_LIBXEXT 1 | 9771 | #define HAVE_LIBXEXT 1 |
| 9780 | _ACEOF | 9772 | _ACEOF |
| @@ -9790,7 +9782,7 @@ LIBXP= | |||
| 9790 | if test "${USE_X_TOOLKIT}" = "MOTIF"; then | 9782 | if test "${USE_X_TOOLKIT}" = "MOTIF"; then |
| 9791 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5 | 9783 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5 |
| 9792 | $as_echo_n "checking for Motif version 2.1... " >&6; } | 9784 | $as_echo_n "checking for Motif version 2.1... " >&6; } |
| 9793 | if ${emacs_cv_motif_version_2_1+:} false; then : | 9785 | if test "${emacs_cv_motif_version_2_1+set}" = set; then : |
| 9794 | $as_echo_n "(cached) " >&6 | 9786 | $as_echo_n "(cached) " >&6 |
| 9795 | else | 9787 | else |
| 9796 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9788 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -9820,7 +9812,7 @@ $as_echo "$emacs_cv_motif_version_2_1" >&6; } | |||
| 9820 | if test $emacs_cv_motif_version_2_1 = yes; then | 9812 | if test $emacs_cv_motif_version_2_1 = yes; then |
| 9821 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in -lXp" >&5 | 9813 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in -lXp" >&5 |
| 9822 | $as_echo_n "checking for XpCreateContext in -lXp... " >&6; } | 9814 | $as_echo_n "checking for XpCreateContext in -lXp... " >&6; } |
| 9823 | if ${ac_cv_lib_Xp_XpCreateContext+:} false; then : | 9815 | if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then : |
| 9824 | $as_echo_n "(cached) " >&6 | 9816 | $as_echo_n "(cached) " >&6 |
| 9825 | else | 9817 | else |
| 9826 | ac_check_lib_save_LIBS=$LIBS | 9818 | ac_check_lib_save_LIBS=$LIBS |
| @@ -9854,14 +9846,14 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 9854 | fi | 9846 | fi |
| 9855 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpCreateContext" >&5 | 9847 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpCreateContext" >&5 |
| 9856 | $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; } | 9848 | $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; } |
| 9857 | if test "x$ac_cv_lib_Xp_XpCreateContext" = xyes; then : | 9849 | if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then : |
| 9858 | LIBXP=-lXp | 9850 | LIBXP=-lXp |
| 9859 | fi | 9851 | fi |
| 9860 | 9852 | ||
| 9861 | else | 9853 | else |
| 9862 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5 | 9854 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5 |
| 9863 | $as_echo_n "checking for LessTif where some systems put it... " >&6; } | 9855 | $as_echo_n "checking for LessTif where some systems put it... " >&6; } |
| 9864 | if ${emacs_cv_lesstif+:} false; then : | 9856 | if test "${emacs_cv_lesstif+set}" = set; then : |
| 9865 | $as_echo_n "(cached) " >&6 | 9857 | $as_echo_n "(cached) " >&6 |
| 9866 | else | 9858 | else |
| 9867 | # We put this in CFLAGS temporarily to precede other -I options | 9859 | # We put this in CFLAGS temporarily to precede other -I options |
| @@ -10020,7 +10012,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 10020 | set dummy pkg-config; ac_word=$2 | 10012 | set dummy pkg-config; ac_word=$2 |
| 10021 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10013 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10022 | $as_echo_n "checking for $ac_word... " >&6; } | 10014 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10023 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 10015 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 10024 | $as_echo_n "(cached) " >&6 | 10016 | $as_echo_n "(cached) " >&6 |
| 10025 | else | 10017 | else |
| 10026 | case $PKG_CONFIG in | 10018 | case $PKG_CONFIG in |
| @@ -10122,7 +10114,7 @@ $as_echo "no" >&6; } | |||
| 10122 | set dummy pkg-config; ac_word=$2 | 10114 | set dummy pkg-config; ac_word=$2 |
| 10123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10115 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10124 | $as_echo_n "checking for $ac_word... " >&6; } | 10116 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10125 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 10117 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 10126 | $as_echo_n "(cached) " >&6 | 10118 | $as_echo_n "(cached) " >&6 |
| 10127 | else | 10119 | else |
| 10128 | case $PKG_CONFIG in | 10120 | case $PKG_CONFIG in |
| @@ -10214,7 +10206,7 @@ $as_echo "no" >&6; } | |||
| 10214 | HAVE_XRENDER=no | 10206 | HAVE_XRENDER=no |
| 10215 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5 | 10207 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5 |
| 10216 | $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } | 10208 | $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } |
| 10217 | if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then : | 10209 | if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then : |
| 10218 | $as_echo_n "(cached) " >&6 | 10210 | $as_echo_n "(cached) " >&6 |
| 10219 | else | 10211 | else |
| 10220 | ac_check_lib_save_LIBS=$LIBS | 10212 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10248,7 +10240,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10248 | fi | 10240 | fi |
| 10249 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 | 10241 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 |
| 10250 | $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } | 10242 | $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } |
| 10251 | if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then : | 10243 | if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then : |
| 10252 | HAVE_XRENDER=yes | 10244 | HAVE_XRENDER=yes |
| 10253 | fi | 10245 | fi |
| 10254 | 10246 | ||
| @@ -10261,10 +10253,10 @@ fi | |||
| 10261 | XFT_LIBS="-lXrender $XFT_LIBS" | 10253 | XFT_LIBS="-lXrender $XFT_LIBS" |
| 10262 | LIBS="$XFT_LIBS $LIBS" | 10254 | LIBS="$XFT_LIBS $LIBS" |
| 10263 | ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" | 10255 | ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" |
| 10264 | if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : | 10256 | if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then : |
| 10265 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5 | 10257 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5 |
| 10266 | $as_echo_n "checking for XftFontOpen in -lXft... " >&6; } | 10258 | $as_echo_n "checking for XftFontOpen in -lXft... " >&6; } |
| 10267 | if ${ac_cv_lib_Xft_XftFontOpen+:} false; then : | 10259 | if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then : |
| 10268 | $as_echo_n "(cached) " >&6 | 10260 | $as_echo_n "(cached) " >&6 |
| 10269 | else | 10261 | else |
| 10270 | ac_check_lib_save_LIBS=$LIBS | 10262 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10298,7 +10290,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10298 | fi | 10290 | fi |
| 10299 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5 | 10291 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5 |
| 10300 | $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; } | 10292 | $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; } |
| 10301 | if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then : | 10293 | if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then : |
| 10302 | HAVE_XFT=yes | 10294 | HAVE_XFT=yes |
| 10303 | fi | 10295 | fi |
| 10304 | 10296 | ||
| @@ -10347,7 +10339,7 @@ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h | |||
| 10347 | set dummy pkg-config; ac_word=$2 | 10339 | set dummy pkg-config; ac_word=$2 |
| 10348 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10340 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10349 | $as_echo_n "checking for $ac_word... " >&6; } | 10341 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10350 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 10342 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 10351 | $as_echo_n "(cached) " >&6 | 10343 | $as_echo_n "(cached) " >&6 |
| 10352 | else | 10344 | else |
| 10353 | case $PKG_CONFIG in | 10345 | case $PKG_CONFIG in |
| @@ -10440,7 +10432,7 @@ $as_echo "#define HAVE_LIBOTF 1" >>confdefs.h | |||
| 10440 | 10432 | ||
| 10441 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OTF_get_variation_glyphs in -lotf" >&5 | 10433 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OTF_get_variation_glyphs in -lotf" >&5 |
| 10442 | $as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; } | 10434 | $as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; } |
| 10443 | if ${ac_cv_lib_otf_OTF_get_variation_glyphs+:} false; then : | 10435 | if test "${ac_cv_lib_otf_OTF_get_variation_glyphs+set}" = set; then : |
| 10444 | $as_echo_n "(cached) " >&6 | 10436 | $as_echo_n "(cached) " >&6 |
| 10445 | else | 10437 | else |
| 10446 | ac_check_lib_save_LIBS=$LIBS | 10438 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10474,7 +10466,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10474 | fi | 10466 | fi |
| 10475 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 | 10467 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 |
| 10476 | $as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } | 10468 | $as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } |
| 10477 | if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = xyes; then : | 10469 | if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then : |
| 10478 | HAVE_OTF_GET_VARIATION_GLYPHS=yes | 10470 | HAVE_OTF_GET_VARIATION_GLYPHS=yes |
| 10479 | else | 10471 | else |
| 10480 | HAVE_OTF_GET_VARIATION_GLYPHS=no | 10472 | HAVE_OTF_GET_VARIATION_GLYPHS=no |
| @@ -10499,7 +10491,7 @@ $as_echo "#define HAVE_OTF_GET_VARIATION_GLYPHS 1" >>confdefs.h | |||
| 10499 | set dummy pkg-config; ac_word=$2 | 10491 | set dummy pkg-config; ac_word=$2 |
| 10500 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10492 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 10501 | $as_echo_n "checking for $ac_word... " >&6; } | 10493 | $as_echo_n "checking for $ac_word... " >&6; } |
| 10502 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 10494 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 10503 | $as_echo_n "(cached) " >&6 | 10495 | $as_echo_n "(cached) " >&6 |
| 10504 | else | 10496 | else |
| 10505 | case $PKG_CONFIG in | 10497 | case $PKG_CONFIG in |
| @@ -10617,10 +10609,10 @@ LIBXPM= | |||
| 10617 | if test "${HAVE_X11}" = "yes"; then | 10609 | if test "${HAVE_X11}" = "yes"; then |
| 10618 | if test "${with_xpm}" != "no"; then | 10610 | if test "${with_xpm}" != "no"; then |
| 10619 | ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" | 10611 | ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" |
| 10620 | if test "x$ac_cv_header_X11_xpm_h" = xyes; then : | 10612 | if test "x$ac_cv_header_X11_xpm_h" = x""yes; then : |
| 10621 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in -lXpm" >&5 | 10613 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in -lXpm" >&5 |
| 10622 | $as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; } | 10614 | $as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; } |
| 10623 | if ${ac_cv_lib_Xpm_XpmReadFileToPixmap+:} false; then : | 10615 | if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then : |
| 10624 | $as_echo_n "(cached) " >&6 | 10616 | $as_echo_n "(cached) " >&6 |
| 10625 | else | 10617 | else |
| 10626 | ac_check_lib_save_LIBS=$LIBS | 10618 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10654,7 +10646,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10654 | fi | 10646 | fi |
| 10655 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 | 10647 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 |
| 10656 | $as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } | 10648 | $as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } |
| 10657 | if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = xyes; then : | 10649 | if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then : |
| 10658 | HAVE_XPM=yes | 10650 | HAVE_XPM=yes |
| 10659 | fi | 10651 | fi |
| 10660 | 10652 | ||
| @@ -10706,10 +10698,10 @@ LIBJPEG= | |||
| 10706 | if test "${HAVE_X11}" = "yes"; then | 10698 | if test "${HAVE_X11}" = "yes"; then |
| 10707 | if test "${with_jpeg}" != "no"; then | 10699 | if test "${with_jpeg}" != "no"; then |
| 10708 | ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" | 10700 | ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" |
| 10709 | if test "x$ac_cv_header_jerror_h" = xyes; then : | 10701 | if test "x$ac_cv_header_jerror_h" = x""yes; then : |
| 10710 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5 | 10702 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5 |
| 10711 | $as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; } | 10703 | $as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; } |
| 10712 | if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then : | 10704 | if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then : |
| 10713 | $as_echo_n "(cached) " >&6 | 10705 | $as_echo_n "(cached) " >&6 |
| 10714 | else | 10706 | else |
| 10715 | ac_check_lib_save_LIBS=$LIBS | 10707 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10743,7 +10735,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10743 | fi | 10735 | fi |
| 10744 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 | 10736 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 |
| 10745 | $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } | 10737 | $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } |
| 10746 | if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then : | 10738 | if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then : |
| 10747 | HAVE_JPEG=yes | 10739 | HAVE_JPEG=yes |
| 10748 | fi | 10740 | fi |
| 10749 | 10741 | ||
| @@ -10802,7 +10794,7 @@ done | |||
| 10802 | if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then | 10794 | if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then |
| 10803 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels in -lpng" >&5 | 10795 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels in -lpng" >&5 |
| 10804 | $as_echo_n "checking for png_get_channels in -lpng... " >&6; } | 10796 | $as_echo_n "checking for png_get_channels in -lpng... " >&6; } |
| 10805 | if ${ac_cv_lib_png_png_get_channels+:} false; then : | 10797 | if test "${ac_cv_lib_png_png_get_channels+set}" = set; then : |
| 10806 | $as_echo_n "(cached) " >&6 | 10798 | $as_echo_n "(cached) " >&6 |
| 10807 | else | 10799 | else |
| 10808 | ac_check_lib_save_LIBS=$LIBS | 10800 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10836,7 +10828,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10836 | fi | 10828 | fi |
| 10837 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_channels" >&5 | 10829 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_channels" >&5 |
| 10838 | $as_echo "$ac_cv_lib_png_png_get_channels" >&6; } | 10830 | $as_echo "$ac_cv_lib_png_png_get_channels" >&6; } |
| 10839 | if test "x$ac_cv_lib_png_png_get_channels" = xyes; then : | 10831 | if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then : |
| 10840 | HAVE_PNG=yes | 10832 | HAVE_PNG=yes |
| 10841 | fi | 10833 | fi |
| 10842 | 10834 | ||
| @@ -10858,13 +10850,13 @@ LIBTIFF= | |||
| 10858 | if test "${HAVE_X11}" = "yes"; then | 10850 | if test "${HAVE_X11}" = "yes"; then |
| 10859 | if test "${with_tiff}" != "no"; then | 10851 | if test "${with_tiff}" != "no"; then |
| 10860 | ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" | 10852 | ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" |
| 10861 | if test "x$ac_cv_header_tiffio_h" = xyes; then : | 10853 | if test "x$ac_cv_header_tiffio_h" = x""yes; then : |
| 10862 | tifflibs="-lz -lm" | 10854 | tifflibs="-lz -lm" |
| 10863 | # At least one tiff package requires the jpeg library. | 10855 | # At least one tiff package requires the jpeg library. |
| 10864 | if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi | 10856 | if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi |
| 10865 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in -ltiff" >&5 | 10857 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in -ltiff" >&5 |
| 10866 | $as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; } | 10858 | $as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; } |
| 10867 | if ${ac_cv_lib_tiff_TIFFGetVersion+:} false; then : | 10859 | if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then : |
| 10868 | $as_echo_n "(cached) " >&6 | 10860 | $as_echo_n "(cached) " >&6 |
| 10869 | else | 10861 | else |
| 10870 | ac_check_lib_save_LIBS=$LIBS | 10862 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10898,7 +10890,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10898 | fi | 10890 | fi |
| 10899 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 | 10891 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 |
| 10900 | $as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; } | 10892 | $as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; } |
| 10901 | if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then : | 10893 | if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then : |
| 10902 | HAVE_TIFF=yes | 10894 | HAVE_TIFF=yes |
| 10903 | fi | 10895 | fi |
| 10904 | 10896 | ||
| @@ -10921,12 +10913,12 @@ HAVE_GIF=no | |||
| 10921 | LIBGIF= | 10913 | LIBGIF= |
| 10922 | if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then | 10914 | if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then |
| 10923 | ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" | 10915 | ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" |
| 10924 | if test "x$ac_cv_header_gif_lib_h" = xyes; then : | 10916 | if test "x$ac_cv_header_gif_lib_h" = x""yes; then : |
| 10925 | # EGifPutExtensionLast only exists from version libungif-4.1.0b1. | 10917 | # EGifPutExtensionLast only exists from version libungif-4.1.0b1. |
| 10926 | # Earlier versions can crash Emacs. | 10918 | # Earlier versions can crash Emacs. |
| 10927 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5 | 10919 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5 |
| 10928 | $as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; } | 10920 | $as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; } |
| 10929 | if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then : | 10921 | if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then : |
| 10930 | $as_echo_n "(cached) " >&6 | 10922 | $as_echo_n "(cached) " >&6 |
| 10931 | else | 10923 | else |
| 10932 | ac_check_lib_save_LIBS=$LIBS | 10924 | ac_check_lib_save_LIBS=$LIBS |
| @@ -10960,7 +10952,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10960 | fi | 10952 | fi |
| 10961 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 | 10953 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 |
| 10962 | $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } | 10954 | $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } |
| 10963 | if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then : | 10955 | if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then : |
| 10964 | HAVE_GIF=yes | 10956 | HAVE_GIF=yes |
| 10965 | else | 10957 | else |
| 10966 | HAVE_GIF=maybe | 10958 | HAVE_GIF=maybe |
| @@ -10976,7 +10968,7 @@ fi | |||
| 10976 | # If gif_lib.h but no libgif, try libungif. | 10968 | # If gif_lib.h but no libgif, try libungif. |
| 10977 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5 | 10969 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5 |
| 10978 | $as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; } | 10970 | $as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; } |
| 10979 | if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then : | 10971 | if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then : |
| 10980 | $as_echo_n "(cached) " >&6 | 10972 | $as_echo_n "(cached) " >&6 |
| 10981 | else | 10973 | else |
| 10982 | ac_check_lib_save_LIBS=$LIBS | 10974 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11010,7 +11002,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11010 | fi | 11002 | fi |
| 11011 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 | 11003 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 |
| 11012 | $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } | 11004 | $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } |
| 11013 | if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then : | 11005 | if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then : |
| 11014 | HAVE_GIF=yes | 11006 | HAVE_GIF=yes |
| 11015 | else | 11007 | else |
| 11016 | HAVE_GIF=no | 11008 | HAVE_GIF=no |
| @@ -11057,10 +11049,10 @@ LIBGPM= | |||
| 11057 | MOUSE_SUPPORT= | 11049 | MOUSE_SUPPORT= |
| 11058 | if test "${with_gpm}" != "no"; then | 11050 | if test "${with_gpm}" != "no"; then |
| 11059 | ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" | 11051 | ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" |
| 11060 | if test "x$ac_cv_header_gpm_h" = xyes; then : | 11052 | if test "x$ac_cv_header_gpm_h" = x""yes; then : |
| 11061 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5 | 11053 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5 |
| 11062 | $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } | 11054 | $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } |
| 11063 | if ${ac_cv_lib_gpm_Gpm_Open+:} false; then : | 11055 | if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then : |
| 11064 | $as_echo_n "(cached) " >&6 | 11056 | $as_echo_n "(cached) " >&6 |
| 11065 | else | 11057 | else |
| 11066 | ac_check_lib_save_LIBS=$LIBS | 11058 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11094,7 +11086,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11094 | fi | 11086 | fi |
| 11095 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5 | 11087 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5 |
| 11096 | $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } | 11088 | $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } |
| 11097 | if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then : | 11089 | if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then : |
| 11098 | HAVE_GPM=yes | 11090 | HAVE_GPM=yes |
| 11099 | fi | 11091 | fi |
| 11100 | 11092 | ||
| @@ -11114,7 +11106,7 @@ fi | |||
| 11114 | 11106 | ||
| 11115 | 11107 | ||
| 11116 | ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default" | 11108 | ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default" |
| 11117 | if test "x$ac_cv_header_malloc_malloc_h" = xyes; then : | 11109 | if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then : |
| 11118 | 11110 | ||
| 11119 | $as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h | 11111 | $as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h |
| 11120 | 11112 | ||
| @@ -11159,10 +11151,10 @@ HAVE_X_SM=no | |||
| 11159 | LIBXSM= | 11151 | LIBXSM= |
| 11160 | if test "${HAVE_X11}" = "yes"; then | 11152 | if test "${HAVE_X11}" = "yes"; then |
| 11161 | ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" | 11153 | ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" |
| 11162 | if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then : | 11154 | if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then : |
| 11163 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 | 11155 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 |
| 11164 | $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } | 11156 | $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } |
| 11165 | if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : | 11157 | if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then : |
| 11166 | $as_echo_n "(cached) " >&6 | 11158 | $as_echo_n "(cached) " >&6 |
| 11167 | else | 11159 | else |
| 11168 | ac_check_lib_save_LIBS=$LIBS | 11160 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11196,7 +11188,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11196 | fi | 11188 | fi |
| 11197 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 | 11189 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 |
| 11198 | $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } | 11190 | $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } |
| 11199 | if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : | 11191 | if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then : |
| 11200 | HAVE_X_SM=yes | 11192 | HAVE_X_SM=yes |
| 11201 | fi | 11193 | fi |
| 11202 | 11194 | ||
| @@ -11227,7 +11219,7 @@ if test "${with_xml2}" != "no"; then | |||
| 11227 | set dummy pkg-config; ac_word=$2 | 11219 | set dummy pkg-config; ac_word=$2 |
| 11228 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 11220 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 11229 | $as_echo_n "checking for $ac_word... " >&6; } | 11221 | $as_echo_n "checking for $ac_word... " >&6; } |
| 11230 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | 11222 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
| 11231 | $as_echo_n "(cached) " >&6 | 11223 | $as_echo_n "(cached) " >&6 |
| 11232 | else | 11224 | else |
| 11233 | case $PKG_CONFIG in | 11225 | case $PKG_CONFIG in |
| @@ -11318,7 +11310,7 @@ $as_echo "no" >&6; } | |||
| 11318 | LIBS="$LIBXML2_LIBS $LIBS" | 11310 | LIBS="$LIBXML2_LIBS $LIBS" |
| 11319 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 | 11311 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 |
| 11320 | $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } | 11312 | $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } |
| 11321 | if ${ac_cv_lib_xml2_htmlReadMemory+:} false; then : | 11313 | if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then : |
| 11322 | $as_echo_n "(cached) " >&6 | 11314 | $as_echo_n "(cached) " >&6 |
| 11323 | else | 11315 | else |
| 11324 | ac_check_lib_save_LIBS=$LIBS | 11316 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11352,7 +11344,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11352 | fi | 11344 | fi |
| 11353 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5 | 11345 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5 |
| 11354 | $as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; } | 11346 | $as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; } |
| 11355 | if test "x$ac_cv_lib_xml2_htmlReadMemory" = xyes; then : | 11347 | if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then : |
| 11356 | HAVE_LIBXML2=yes | 11348 | HAVE_LIBXML2=yes |
| 11357 | else | 11349 | else |
| 11358 | HAVE_LIBXML2=no | 11350 | HAVE_LIBXML2=no |
| @@ -11374,7 +11366,7 @@ fi | |||
| 11374 | # If netdb.h doesn't declare h_errno, we must declare it by hand. | 11366 | # If netdb.h doesn't declare h_errno, we must declare it by hand. |
| 11375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5 | 11367 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5 |
| 11376 | $as_echo_n "checking whether netdb declares h_errno... " >&6; } | 11368 | $as_echo_n "checking whether netdb declares h_errno... " >&6; } |
| 11377 | if ${emacs_cv_netdb_declares_h_errno+:} false; then : | 11369 | if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then : |
| 11378 | $as_echo_n "(cached) " >&6 | 11370 | $as_echo_n "(cached) " >&6 |
| 11379 | else | 11371 | else |
| 11380 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 11372 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -11404,22 +11396,11 @@ $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h | |||
| 11404 | 11396 | ||
| 11405 | fi | 11397 | fi |
| 11406 | 11398 | ||
| 11407 | ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" | ||
| 11408 | if test "x$ac_cv_type_size_t" = xyes; then : | ||
| 11409 | |||
| 11410 | else | ||
| 11411 | |||
| 11412 | cat >>confdefs.h <<_ACEOF | ||
| 11413 | #define size_t unsigned int | ||
| 11414 | _ACEOF | ||
| 11415 | |||
| 11416 | fi | ||
| 11417 | |||
| 11418 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | 11399 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works |
| 11419 | # for constant arguments. Useless! | 11400 | # for constant arguments. Useless! |
| 11420 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 | 11401 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 |
| 11421 | $as_echo_n "checking for working alloca.h... " >&6; } | 11402 | $as_echo_n "checking for working alloca.h... " >&6; } |
| 11422 | if ${ac_cv_working_alloca_h+:} false; then : | 11403 | if test "${ac_cv_working_alloca_h+set}" = set; then : |
| 11423 | $as_echo_n "(cached) " >&6 | 11404 | $as_echo_n "(cached) " >&6 |
| 11424 | else | 11405 | else |
| 11425 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 11406 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -11452,7 +11433,7 @@ fi | |||
| 11452 | 11433 | ||
| 11453 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 | 11434 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 |
| 11454 | $as_echo_n "checking for alloca... " >&6; } | 11435 | $as_echo_n "checking for alloca... " >&6; } |
| 11455 | if ${ac_cv_func_alloca_works+:} false; then : | 11436 | if test "${ac_cv_func_alloca_works+set}" = set; then : |
| 11456 | $as_echo_n "(cached) " >&6 | 11437 | $as_echo_n "(cached) " >&6 |
| 11457 | else | 11438 | else |
| 11458 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 11439 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -11471,7 +11452,7 @@ else | |||
| 11471 | #pragma alloca | 11452 | #pragma alloca |
| 11472 | # else | 11453 | # else |
| 11473 | # ifndef alloca /* predefined by HP cc +Olibcalls */ | 11454 | # ifndef alloca /* predefined by HP cc +Olibcalls */ |
| 11474 | void *alloca (size_t); | 11455 | char *alloca (); |
| 11475 | # endif | 11456 | # endif |
| 11476 | # endif | 11457 | # endif |
| 11477 | # endif | 11458 | # endif |
| @@ -11515,7 +11496,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h | |||
| 11515 | 11496 | ||
| 11516 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 | 11497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 |
| 11517 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } | 11498 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } |
| 11518 | if ${ac_cv_os_cray+:} false; then : | 11499 | if test "${ac_cv_os_cray+set}" = set; then : |
| 11519 | $as_echo_n "(cached) " >&6 | 11500 | $as_echo_n "(cached) " >&6 |
| 11520 | else | 11501 | else |
| 11521 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 11502 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -11556,7 +11537,7 @@ fi | |||
| 11556 | 11537 | ||
| 11557 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 | 11538 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 |
| 11558 | $as_echo_n "checking stack direction for C alloca... " >&6; } | 11539 | $as_echo_n "checking stack direction for C alloca... " >&6; } |
| 11559 | if ${ac_cv_c_stack_direction+:} false; then : | 11540 | if test "${ac_cv_c_stack_direction+set}" = set; then : |
| 11560 | $as_echo_n "(cached) " >&6 | 11541 | $as_echo_n "(cached) " >&6 |
| 11561 | else | 11542 | else |
| 11562 | if test "$cross_compiling" = yes; then : | 11543 | if test "$cross_compiling" = yes; then : |
| @@ -11613,7 +11594,7 @@ fi | |||
| 11613 | # On HPUX 9.01, -lm does not contain logb, so check for sqrt. | 11594 | # On HPUX 9.01, -lm does not contain logb, so check for sqrt. |
| 11614 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 | 11595 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 |
| 11615 | $as_echo_n "checking for sqrt in -lm... " >&6; } | 11596 | $as_echo_n "checking for sqrt in -lm... " >&6; } |
| 11616 | if ${ac_cv_lib_m_sqrt+:} false; then : | 11597 | if test "${ac_cv_lib_m_sqrt+set}" = set; then : |
| 11617 | $as_echo_n "(cached) " >&6 | 11598 | $as_echo_n "(cached) " >&6 |
| 11618 | else | 11599 | else |
| 11619 | ac_check_lib_save_LIBS=$LIBS | 11600 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11647,7 +11628,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11647 | fi | 11628 | fi |
| 11648 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 | 11629 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 |
| 11649 | $as_echo "$ac_cv_lib_m_sqrt" >&6; } | 11630 | $as_echo "$ac_cv_lib_m_sqrt" >&6; } |
| 11650 | if test "x$ac_cv_lib_m_sqrt" = xyes; then : | 11631 | if test "x$ac_cv_lib_m_sqrt" = x""yes; then : |
| 11651 | cat >>confdefs.h <<_ACEOF | 11632 | cat >>confdefs.h <<_ACEOF |
| 11652 | #define HAVE_LIBM 1 | 11633 | #define HAVE_LIBM 1 |
| 11653 | _ACEOF | 11634 | _ACEOF |
| @@ -11661,7 +11642,7 @@ fi | |||
| 11661 | # have the same check as for liblockfile below. | 11642 | # have the same check as for liblockfile below. |
| 11662 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5 | 11643 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5 |
| 11663 | $as_echo_n "checking for maillock in -lmail... " >&6; } | 11644 | $as_echo_n "checking for maillock in -lmail... " >&6; } |
| 11664 | if ${ac_cv_lib_mail_maillock+:} false; then : | 11645 | if test "${ac_cv_lib_mail_maillock+set}" = set; then : |
| 11665 | $as_echo_n "(cached) " >&6 | 11646 | $as_echo_n "(cached) " >&6 |
| 11666 | else | 11647 | else |
| 11667 | ac_check_lib_save_LIBS=$LIBS | 11648 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11695,7 +11676,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11695 | fi | 11676 | fi |
| 11696 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5 | 11677 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5 |
| 11697 | $as_echo "$ac_cv_lib_mail_maillock" >&6; } | 11678 | $as_echo "$ac_cv_lib_mail_maillock" >&6; } |
| 11698 | if test "x$ac_cv_lib_mail_maillock" = xyes; then : | 11679 | if test "x$ac_cv_lib_mail_maillock" = x""yes; then : |
| 11699 | have_mail=yes | 11680 | have_mail=yes |
| 11700 | else | 11681 | else |
| 11701 | have_mail=no | 11682 | have_mail=no |
| @@ -11712,7 +11693,7 @@ else | |||
| 11712 | fi | 11693 | fi |
| 11713 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5 | 11694 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5 |
| 11714 | $as_echo_n "checking for maillock in -llockfile... " >&6; } | 11695 | $as_echo_n "checking for maillock in -llockfile... " >&6; } |
| 11715 | if ${ac_cv_lib_lockfile_maillock+:} false; then : | 11696 | if test "${ac_cv_lib_lockfile_maillock+set}" = set; then : |
| 11716 | $as_echo_n "(cached) " >&6 | 11697 | $as_echo_n "(cached) " >&6 |
| 11717 | else | 11698 | else |
| 11718 | ac_check_lib_save_LIBS=$LIBS | 11699 | ac_check_lib_save_LIBS=$LIBS |
| @@ -11746,7 +11727,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 11746 | fi | 11727 | fi |
| 11747 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5 | 11728 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5 |
| 11748 | $as_echo "$ac_cv_lib_lockfile_maillock" >&6; } | 11729 | $as_echo "$ac_cv_lib_lockfile_maillock" >&6; } |
| 11749 | if test "x$ac_cv_lib_lockfile_maillock" = xyes; then : | 11730 | if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then : |
| 11750 | have_lockfile=yes | 11731 | have_lockfile=yes |
| 11751 | else | 11732 | else |
| 11752 | have_lockfile=no | 11733 | have_lockfile=no |
| @@ -11766,7 +11747,7 @@ else | |||
| 11766 | set dummy liblockfile.so; ac_word=$2 | 11747 | set dummy liblockfile.so; ac_word=$2 |
| 11767 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 11748 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 11768 | $as_echo_n "checking for $ac_word... " >&6; } | 11749 | $as_echo_n "checking for $ac_word... " >&6; } |
| 11769 | if ${ac_cv_prog_liblockfile+:} false; then : | 11750 | if test "${ac_cv_prog_liblockfile+set}" = set; then : |
| 11770 | $as_echo_n "(cached) " >&6 | 11751 | $as_echo_n "(cached) " >&6 |
| 11771 | else | 11752 | else |
| 11772 | if test -n "$liblockfile"; then | 11753 | if test -n "$liblockfile"; then |
| @@ -11810,7 +11791,7 @@ fi | |||
| 11810 | for ac_func in touchlock | 11791 | for ac_func in touchlock |
| 11811 | do : | 11792 | do : |
| 11812 | ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock" | 11793 | ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock" |
| 11813 | if test "x$ac_cv_func_touchlock" = xyes; then : | 11794 | if test "x$ac_cv_func_touchlock" = x""yes; then : |
| 11814 | cat >>confdefs.h <<_ACEOF | 11795 | cat >>confdefs.h <<_ACEOF |
| 11815 | #define HAVE_TOUCHLOCK 1 | 11796 | #define HAVE_TOUCHLOCK 1 |
| 11816 | _ACEOF | 11797 | _ACEOF |
| @@ -11821,7 +11802,7 @@ done | |||
| 11821 | for ac_header in maillock.h | 11802 | for ac_header in maillock.h |
| 11822 | do : | 11803 | do : |
| 11823 | ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default" | 11804 | ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default" |
| 11824 | if test "x$ac_cv_header_maillock_h" = xyes; then : | 11805 | if test "x$ac_cv_header_maillock_h" = x""yes; then : |
| 11825 | cat >>confdefs.h <<_ACEOF | 11806 | cat >>confdefs.h <<_ACEOF |
| 11826 | #define HAVE_MAILLOCK_H 1 | 11807 | #define HAVE_MAILLOCK_H 1 |
| 11827 | _ACEOF | 11808 | _ACEOF |
| @@ -11903,7 +11884,7 @@ done | |||
| 11903 | for ac_header in sys/un.h | 11884 | for ac_header in sys/un.h |
| 11904 | do : | 11885 | do : |
| 11905 | ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" | 11886 | ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" |
| 11906 | if test "x$ac_cv_header_sys_un_h" = xyes; then : | 11887 | if test "x$ac_cv_header_sys_un_h" = x""yes; then : |
| 11907 | cat >>confdefs.h <<_ACEOF | 11888 | cat >>confdefs.h <<_ACEOF |
| 11908 | #define HAVE_SYS_UN_H 1 | 11889 | #define HAVE_SYS_UN_H 1 |
| 11909 | _ACEOF | 11890 | _ACEOF |
| @@ -11936,7 +11917,7 @@ done | |||
| 11936 | 11917 | ||
| 11937 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 | 11918 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 |
| 11938 | $as_echo_n "checking for working mktime... " >&6; } | 11919 | $as_echo_n "checking for working mktime... " >&6; } |
| 11939 | if ${ac_cv_func_working_mktime+:} false; then : | 11920 | if test "${ac_cv_func_working_mktime+set}" = set; then : |
| 11940 | $as_echo_n "(cached) " >&6 | 11921 | $as_echo_n "(cached) " >&6 |
| 11941 | else | 11922 | else |
| 11942 | if test "$cross_compiling" = yes; then : | 11923 | if test "$cross_compiling" = yes; then : |
| @@ -12173,7 +12154,7 @@ ac_save_LIBS=$LIBS | |||
| 12173 | 12154 | ||
| 12174 | # Check for getloadavg, but be sure not to touch the cache variable. | 12155 | # Check for getloadavg, but be sure not to touch the cache variable. |
| 12175 | (ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" | 12156 | (ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" |
| 12176 | if test "x$ac_cv_func_getloadavg" = xyes; then : | 12157 | if test "x$ac_cv_func_getloadavg" = x""yes; then : |
| 12177 | exit 0 | 12158 | exit 0 |
| 12178 | else | 12159 | else |
| 12179 | exit 1 | 12160 | exit 1 |
| @@ -12184,7 +12165,7 @@ fi | |||
| 12184 | for ac_func in pstat_getdynamic | 12165 | for ac_func in pstat_getdynamic |
| 12185 | do : | 12166 | do : |
| 12186 | ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" | 12167 | ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" |
| 12187 | if test "x$ac_cv_func_pstat_getdynamic" = xyes; then : | 12168 | if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then : |
| 12188 | cat >>confdefs.h <<_ACEOF | 12169 | cat >>confdefs.h <<_ACEOF |
| 12189 | #define HAVE_PSTAT_GETDYNAMIC 1 | 12170 | #define HAVE_PSTAT_GETDYNAMIC 1 |
| 12190 | _ACEOF | 12171 | _ACEOF |
| @@ -12196,7 +12177,7 @@ done | |||
| 12196 | # Solaris has libkstat which does not require root. | 12177 | # Solaris has libkstat which does not require root. |
| 12197 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 | 12178 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 |
| 12198 | $as_echo_n "checking for kstat_open in -lkstat... " >&6; } | 12179 | $as_echo_n "checking for kstat_open in -lkstat... " >&6; } |
| 12199 | if ${ac_cv_lib_kstat_kstat_open+:} false; then : | 12180 | if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then : |
| 12200 | $as_echo_n "(cached) " >&6 | 12181 | $as_echo_n "(cached) " >&6 |
| 12201 | else | 12182 | else |
| 12202 | ac_check_lib_save_LIBS=$LIBS | 12183 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12230,7 +12211,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12230 | fi | 12211 | fi |
| 12231 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 | 12212 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 |
| 12232 | $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } | 12213 | $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } |
| 12233 | if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then : | 12214 | if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then : |
| 12234 | cat >>confdefs.h <<_ACEOF | 12215 | cat >>confdefs.h <<_ACEOF |
| 12235 | #define HAVE_LIBKSTAT 1 | 12216 | #define HAVE_LIBKSTAT 1 |
| 12236 | _ACEOF | 12217 | _ACEOF |
| @@ -12248,7 +12229,7 @@ test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes | |||
| 12248 | if test $ac_have_func = no; then | 12229 | if test $ac_have_func = no; then |
| 12249 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 | 12230 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 |
| 12250 | $as_echo_n "checking for elf_begin in -lelf... " >&6; } | 12231 | $as_echo_n "checking for elf_begin in -lelf... " >&6; } |
| 12251 | if ${ac_cv_lib_elf_elf_begin+:} false; then : | 12232 | if test "${ac_cv_lib_elf_elf_begin+set}" = set; then : |
| 12252 | $as_echo_n "(cached) " >&6 | 12233 | $as_echo_n "(cached) " >&6 |
| 12253 | else | 12234 | else |
| 12254 | ac_check_lib_save_LIBS=$LIBS | 12235 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12282,7 +12263,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12282 | fi | 12263 | fi |
| 12283 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5 | 12264 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5 |
| 12284 | $as_echo "$ac_cv_lib_elf_elf_begin" >&6; } | 12265 | $as_echo "$ac_cv_lib_elf_elf_begin" >&6; } |
| 12285 | if test "x$ac_cv_lib_elf_elf_begin" = xyes; then : | 12266 | if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then : |
| 12286 | LIBS="-lelf $LIBS" | 12267 | LIBS="-lelf $LIBS" |
| 12287 | fi | 12268 | fi |
| 12288 | 12269 | ||
| @@ -12290,7 +12271,7 @@ fi | |||
| 12290 | if test $ac_have_func = no; then | 12271 | if test $ac_have_func = no; then |
| 12291 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5 | 12272 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5 |
| 12292 | $as_echo_n "checking for kvm_open in -lkvm... " >&6; } | 12273 | $as_echo_n "checking for kvm_open in -lkvm... " >&6; } |
| 12293 | if ${ac_cv_lib_kvm_kvm_open+:} false; then : | 12274 | if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then : |
| 12294 | $as_echo_n "(cached) " >&6 | 12275 | $as_echo_n "(cached) " >&6 |
| 12295 | else | 12276 | else |
| 12296 | ac_check_lib_save_LIBS=$LIBS | 12277 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12324,14 +12305,14 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12324 | fi | 12305 | fi |
| 12325 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5 | 12306 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5 |
| 12326 | $as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } | 12307 | $as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } |
| 12327 | if test "x$ac_cv_lib_kvm_kvm_open" = xyes; then : | 12308 | if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then : |
| 12328 | LIBS="-lkvm $LIBS" | 12309 | LIBS="-lkvm $LIBS" |
| 12329 | fi | 12310 | fi |
| 12330 | 12311 | ||
| 12331 | # Check for the 4.4BSD definition of getloadavg. | 12312 | # Check for the 4.4BSD definition of getloadavg. |
| 12332 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5 | 12313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5 |
| 12333 | $as_echo_n "checking for getloadavg in -lutil... " >&6; } | 12314 | $as_echo_n "checking for getloadavg in -lutil... " >&6; } |
| 12334 | if ${ac_cv_lib_util_getloadavg+:} false; then : | 12315 | if test "${ac_cv_lib_util_getloadavg+set}" = set; then : |
| 12335 | $as_echo_n "(cached) " >&6 | 12316 | $as_echo_n "(cached) " >&6 |
| 12336 | else | 12317 | else |
| 12337 | ac_check_lib_save_LIBS=$LIBS | 12318 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12365,7 +12346,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12365 | fi | 12346 | fi |
| 12366 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 | 12347 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 |
| 12367 | $as_echo "$ac_cv_lib_util_getloadavg" >&6; } | 12348 | $as_echo "$ac_cv_lib_util_getloadavg" >&6; } |
| 12368 | if test "x$ac_cv_lib_util_getloadavg" = xyes; then : | 12349 | if test "x$ac_cv_lib_util_getloadavg" = x""yes; then : |
| 12369 | LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes | 12350 | LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes |
| 12370 | fi | 12351 | fi |
| 12371 | 12352 | ||
| @@ -12378,7 +12359,7 @@ if test $ac_have_func = no; then | |||
| 12378 | LIBS="-L/usr/local/lib $LIBS" | 12359 | LIBS="-L/usr/local/lib $LIBS" |
| 12379 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5 | 12360 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5 |
| 12380 | $as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; } | 12361 | $as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; } |
| 12381 | if ${ac_cv_lib_getloadavg_getloadavg+:} false; then : | 12362 | if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then : |
| 12382 | $as_echo_n "(cached) " >&6 | 12363 | $as_echo_n "(cached) " >&6 |
| 12383 | else | 12364 | else |
| 12384 | ac_check_lib_save_LIBS=$LIBS | 12365 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12412,7 +12393,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12412 | fi | 12393 | fi |
| 12413 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 | 12394 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 |
| 12414 | $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } | 12395 | $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } |
| 12415 | if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes; then : | 12396 | if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then : |
| 12416 | LIBS="-lgetloadavg $LIBS" | 12397 | LIBS="-lgetloadavg $LIBS" |
| 12417 | else | 12398 | else |
| 12418 | LIBS=$ac_getloadavg_LIBS | 12399 | LIBS=$ac_getloadavg_LIBS |
| @@ -12425,7 +12406,7 @@ fi | |||
| 12425 | for ac_func in getloadavg | 12406 | for ac_func in getloadavg |
| 12426 | do : | 12407 | do : |
| 12427 | ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" | 12408 | ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" |
| 12428 | if test "x$ac_cv_func_getloadavg" = xyes; then : | 12409 | if test "x$ac_cv_func_getloadavg" = x""yes; then : |
| 12429 | cat >>confdefs.h <<_ACEOF | 12410 | cat >>confdefs.h <<_ACEOF |
| 12430 | #define HAVE_GETLOADAVG 1 | 12411 | #define HAVE_GETLOADAVG 1 |
| 12431 | _ACEOF | 12412 | _ACEOF |
| @@ -12443,14 +12424,14 @@ $as_echo "#define C_GETLOADAVG 1" >>confdefs.h | |||
| 12443 | # Figure out what our getloadavg.c needs. | 12424 | # Figure out what our getloadavg.c needs. |
| 12444 | ac_have_func=no | 12425 | ac_have_func=no |
| 12445 | ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" | 12426 | ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" |
| 12446 | if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then : | 12427 | if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then : |
| 12447 | ac_have_func=yes | 12428 | ac_have_func=yes |
| 12448 | 12429 | ||
| 12449 | $as_echo "#define DGUX 1" >>confdefs.h | 12430 | $as_echo "#define DGUX 1" >>confdefs.h |
| 12450 | 12431 | ||
| 12451 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 | 12432 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 |
| 12452 | $as_echo_n "checking for dg_sys_info in -ldgc... " >&6; } | 12433 | $as_echo_n "checking for dg_sys_info in -ldgc... " >&6; } |
| 12453 | if ${ac_cv_lib_dgc_dg_sys_info+:} false; then : | 12434 | if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then : |
| 12454 | $as_echo_n "(cached) " >&6 | 12435 | $as_echo_n "(cached) " >&6 |
| 12455 | else | 12436 | else |
| 12456 | ac_check_lib_save_LIBS=$LIBS | 12437 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12484,7 +12465,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12484 | fi | 12465 | fi |
| 12485 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5 | 12466 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5 |
| 12486 | $as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } | 12467 | $as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } |
| 12487 | if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes; then : | 12468 | if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then : |
| 12488 | cat >>confdefs.h <<_ACEOF | 12469 | cat >>confdefs.h <<_ACEOF |
| 12489 | #define HAVE_LIBDGC 1 | 12470 | #define HAVE_LIBDGC 1 |
| 12490 | _ACEOF | 12471 | _ACEOF |
| @@ -12498,7 +12479,7 @@ fi | |||
| 12498 | 12479 | ||
| 12499 | 12480 | ||
| 12500 | ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" | 12481 | ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" |
| 12501 | if test "x$ac_cv_header_locale_h" = xyes; then : | 12482 | if test "x$ac_cv_header_locale_h" = x""yes; then : |
| 12502 | 12483 | ||
| 12503 | fi | 12484 | fi |
| 12504 | 12485 | ||
| @@ -12506,7 +12487,7 @@ fi | |||
| 12506 | for ac_func in setlocale | 12487 | for ac_func in setlocale |
| 12507 | do : | 12488 | do : |
| 12508 | ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" | 12489 | ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" |
| 12509 | if test "x$ac_cv_func_setlocale" = xyes; then : | 12490 | if test "x$ac_cv_func_setlocale" = x""yes; then : |
| 12510 | cat >>confdefs.h <<_ACEOF | 12491 | cat >>confdefs.h <<_ACEOF |
| 12511 | #define HAVE_SETLOCALE 1 | 12492 | #define HAVE_SETLOCALE 1 |
| 12512 | _ACEOF | 12493 | _ACEOF |
| @@ -12518,8 +12499,7 @@ done | |||
| 12518 | # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it | 12499 | # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it |
| 12519 | # uses stabs), but it is still SVR4. We cannot check for <elf.h> because | 12500 | # uses stabs), but it is still SVR4. We cannot check for <elf.h> because |
| 12520 | # Irix 4.0.5F has the header but not the library. | 12501 | # Irix 4.0.5F has the header but not the library. |
| 12521 | if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes \ | 12502 | if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then |
| 12522 | && test "$ac_cv_lib_kvm_kvm_open" = yes; then | ||
| 12523 | ac_have_func=yes | 12503 | ac_have_func=yes |
| 12524 | 12504 | ||
| 12525 | $as_echo "#define SVR4 1" >>confdefs.h | 12505 | $as_echo "#define SVR4 1" >>confdefs.h |
| @@ -12528,7 +12508,7 @@ fi | |||
| 12528 | 12508 | ||
| 12529 | if test $ac_have_func = no; then | 12509 | if test $ac_have_func = no; then |
| 12530 | ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" | 12510 | ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" |
| 12531 | if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes; then : | 12511 | if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then : |
| 12532 | ac_have_func=yes | 12512 | ac_have_func=yes |
| 12533 | 12513 | ||
| 12534 | $as_echo "#define UMAX 1" >>confdefs.h | 12514 | $as_echo "#define UMAX 1" >>confdefs.h |
| @@ -12543,7 +12523,7 @@ fi | |||
| 12543 | 12523 | ||
| 12544 | if test $ac_have_func = no; then | 12524 | if test $ac_have_func = no; then |
| 12545 | ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" | 12525 | ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" |
| 12546 | if test "x$ac_cv_header_sys_cpustats_h" = xyes; then : | 12526 | if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then : |
| 12547 | ac_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h | 12527 | ac_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h |
| 12548 | 12528 | ||
| 12549 | fi | 12529 | fi |
| @@ -12555,7 +12535,7 @@ if test $ac_have_func = no; then | |||
| 12555 | for ac_header in mach/mach.h | 12535 | for ac_header in mach/mach.h |
| 12556 | do : | 12536 | do : |
| 12557 | ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" | 12537 | ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" |
| 12558 | if test "x$ac_cv_header_mach_mach_h" = xyes; then : | 12538 | if test "x$ac_cv_header_mach_mach_h" = x""yes; then : |
| 12559 | cat >>confdefs.h <<_ACEOF | 12539 | cat >>confdefs.h <<_ACEOF |
| 12560 | #define HAVE_MACH_MACH_H 1 | 12540 | #define HAVE_MACH_MACH_H 1 |
| 12561 | _ACEOF | 12541 | _ACEOF |
| @@ -12569,13 +12549,13 @@ fi | |||
| 12569 | for ac_header in nlist.h | 12549 | for ac_header in nlist.h |
| 12570 | do : | 12550 | do : |
| 12571 | ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" | 12551 | ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" |
| 12572 | if test "x$ac_cv_header_nlist_h" = xyes; then : | 12552 | if test "x$ac_cv_header_nlist_h" = x""yes; then : |
| 12573 | cat >>confdefs.h <<_ACEOF | 12553 | cat >>confdefs.h <<_ACEOF |
| 12574 | #define HAVE_NLIST_H 1 | 12554 | #define HAVE_NLIST_H 1 |
| 12575 | _ACEOF | 12555 | _ACEOF |
| 12576 | ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h> | 12556 | ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h> |
| 12577 | " | 12557 | " |
| 12578 | if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes; then : | 12558 | if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then : |
| 12579 | 12559 | ||
| 12580 | cat >>confdefs.h <<_ACEOF | 12560 | cat >>confdefs.h <<_ACEOF |
| 12581 | #define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 | 12561 | #define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 |
| @@ -12598,7 +12578,7 @@ done | |||
| 12598 | # Some definitions of getloadavg require that the program be installed setgid. | 12578 | # Some definitions of getloadavg require that the program be installed setgid. |
| 12599 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getloadavg requires setgid" >&5 | 12579 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getloadavg requires setgid" >&5 |
| 12600 | $as_echo_n "checking whether getloadavg requires setgid... " >&6; } | 12580 | $as_echo_n "checking whether getloadavg requires setgid... " >&6; } |
| 12601 | if ${ac_cv_func_getloadavg_setgid+:} false; then : | 12581 | if test "${ac_cv_func_getloadavg_setgid+set}" = set; then : |
| 12602 | $as_echo_n "(cached) " >&6 | 12582 | $as_echo_n "(cached) " >&6 |
| 12603 | else | 12583 | else |
| 12604 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 12584 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -12631,7 +12611,7 @@ fi | |||
| 12631 | if test $ac_cv_func_getloadavg_setgid = yes; then | 12611 | if test $ac_cv_func_getloadavg_setgid = yes; then |
| 12632 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking group of /dev/kmem" >&5 | 12612 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking group of /dev/kmem" >&5 |
| 12633 | $as_echo_n "checking group of /dev/kmem... " >&6; } | 12613 | $as_echo_n "checking group of /dev/kmem... " >&6; } |
| 12634 | if ${ac_cv_group_kmem+:} false; then : | 12614 | if test "${ac_cv_group_kmem+set}" = set; then : |
| 12635 | $as_echo_n "(cached) " >&6 | 12615 | $as_echo_n "(cached) " >&6 |
| 12636 | else | 12616 | else |
| 12637 | # On Solaris, /dev/kmem is a symlink. Get info on the real file. | 12617 | # On Solaris, /dev/kmem is a symlink. Get info on the real file. |
| @@ -12659,7 +12639,7 @@ LIBS=$ac_save_LIBS | |||
| 12659 | 12639 | ||
| 12660 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 | 12640 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 |
| 12661 | $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } | 12641 | $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } |
| 12662 | if ${ac_cv_sys_largefile_source+:} false; then : | 12642 | if test "${ac_cv_sys_largefile_source+set}" = set; then : |
| 12663 | $as_echo_n "(cached) " >&6 | 12643 | $as_echo_n "(cached) " >&6 |
| 12664 | else | 12644 | else |
| 12665 | while :; do | 12645 | while :; do |
| @@ -12752,7 +12732,7 @@ fi | |||
| 12752 | for ac_header in getopt.h | 12732 | for ac_header in getopt.h |
| 12753 | do : | 12733 | do : |
| 12754 | ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" | 12734 | ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" |
| 12755 | if test "x$ac_cv_header_getopt_h" = xyes; then : | 12735 | if test "x$ac_cv_header_getopt_h" = x""yes; then : |
| 12756 | cat >>confdefs.h <<_ACEOF | 12736 | cat >>confdefs.h <<_ACEOF |
| 12757 | #define HAVE_GETOPT_H 1 | 12737 | #define HAVE_GETOPT_H 1 |
| 12758 | _ACEOF | 12738 | _ACEOF |
| @@ -12767,7 +12747,7 @@ done | |||
| 12767 | for ac_func in getopt_long_only | 12747 | for ac_func in getopt_long_only |
| 12768 | do : | 12748 | do : |
| 12769 | ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" | 12749 | ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" |
| 12770 | if test "x$ac_cv_func_getopt_long_only" = xyes; then : | 12750 | if test "x$ac_cv_func_getopt_long_only" = x""yes; then : |
| 12771 | cat >>confdefs.h <<_ACEOF | 12751 | cat >>confdefs.h <<_ACEOF |
| 12772 | #define HAVE_GETOPT_LONG_ONLY 1 | 12752 | #define HAVE_GETOPT_LONG_ONLY 1 |
| 12773 | _ACEOF | 12753 | _ACEOF |
| @@ -12782,7 +12762,7 @@ done | |||
| 12782 | if test -z "$GETOPT_H"; then | 12762 | if test -z "$GETOPT_H"; then |
| 12783 | ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h> | 12763 | ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset" "#include <getopt.h> |
| 12784 | " | 12764 | " |
| 12785 | if test "x$ac_cv_have_decl_optreset" = xyes; then : | 12765 | if test "x$ac_cv_have_decl_optreset" = x""yes; then : |
| 12786 | GETOPT_H=getopt.h | 12766 | GETOPT_H=getopt.h |
| 12787 | fi | 12767 | fi |
| 12788 | 12768 | ||
| @@ -12791,13 +12771,13 @@ fi | |||
| 12791 | if test -z "$GETOPT_H"; then | 12771 | if test -z "$GETOPT_H"; then |
| 12792 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5 | 12772 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5 |
| 12793 | $as_echo_n "checking for working GNU getopt function... " >&6; } | 12773 | $as_echo_n "checking for working GNU getopt function... " >&6; } |
| 12794 | if ${gl_cv_func_gnu_getopt+:} false; then : | 12774 | if test "${gl_cv_func_gnu_getopt+set}" = set; then : |
| 12795 | $as_echo_n "(cached) " >&6 | 12775 | $as_echo_n "(cached) " >&6 |
| 12796 | else | 12776 | else |
| 12797 | if test "$cross_compiling" = yes; then : | 12777 | if test "$cross_compiling" = yes; then : |
| 12798 | ac_fn_c_check_decl "$LINENO" "getopt_clip" "ac_cv_have_decl_getopt_clip" "#include <getopt.h> | 12778 | ac_fn_c_check_decl "$LINENO" "getopt_clip" "ac_cv_have_decl_getopt_clip" "#include <getopt.h> |
| 12799 | " | 12779 | " |
| 12800 | if test "x$ac_cv_have_decl_getopt_clip" = xyes; then : | 12780 | if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then : |
| 12801 | gl_cv_func_gnu_getopt=no | 12781 | gl_cv_func_gnu_getopt=no |
| 12802 | else | 12782 | else |
| 12803 | gl_cv_func_gnu_getopt=yes | 12783 | gl_cv_func_gnu_getopt=yes |
| @@ -12858,7 +12838,7 @@ fi | |||
| 12858 | 12838 | ||
| 12859 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5 | 12839 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5 |
| 12860 | $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; } | 12840 | $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; } |
| 12861 | if ${ac_cv_func_getpgrp_void+:} false; then : | 12841 | if test "${ac_cv_func_getpgrp_void+set}" = set; then : |
| 12862 | $as_echo_n "(cached) " >&6 | 12842 | $as_echo_n "(cached) " >&6 |
| 12863 | else | 12843 | else |
| 12864 | # Use it with a single arg. | 12844 | # Use it with a single arg. |
| @@ -12893,7 +12873,7 @@ fi | |||
| 12893 | for ac_func in strftime | 12873 | for ac_func in strftime |
| 12894 | do : | 12874 | do : |
| 12895 | ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" | 12875 | ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" |
| 12896 | if test "x$ac_cv_func_strftime" = xyes; then : | 12876 | if test "x$ac_cv_func_strftime" = x""yes; then : |
| 12897 | cat >>confdefs.h <<_ACEOF | 12877 | cat >>confdefs.h <<_ACEOF |
| 12898 | #define HAVE_STRFTIME 1 | 12878 | #define HAVE_STRFTIME 1 |
| 12899 | _ACEOF | 12879 | _ACEOF |
| @@ -12902,7 +12882,7 @@ else | |||
| 12902 | # strftime is in -lintl on SCO UNIX. | 12882 | # strftime is in -lintl on SCO UNIX. |
| 12903 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 | 12883 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 |
| 12904 | $as_echo_n "checking for strftime in -lintl... " >&6; } | 12884 | $as_echo_n "checking for strftime in -lintl... " >&6; } |
| 12905 | if ${ac_cv_lib_intl_strftime+:} false; then : | 12885 | if test "${ac_cv_lib_intl_strftime+set}" = set; then : |
| 12906 | $as_echo_n "(cached) " >&6 | 12886 | $as_echo_n "(cached) " >&6 |
| 12907 | else | 12887 | else |
| 12908 | ac_check_lib_save_LIBS=$LIBS | 12888 | ac_check_lib_save_LIBS=$LIBS |
| @@ -12936,7 +12916,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12936 | fi | 12916 | fi |
| 12937 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 | 12917 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 |
| 12938 | $as_echo "$ac_cv_lib_intl_strftime" >&6; } | 12918 | $as_echo "$ac_cv_lib_intl_strftime" >&6; } |
| 12939 | if test "x$ac_cv_lib_intl_strftime" = xyes; then : | 12919 | if test "x$ac_cv_lib_intl_strftime" = x""yes; then : |
| 12940 | $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h | 12920 | $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h |
| 12941 | 12921 | ||
| 12942 | LIBS="-lintl $LIBS" | 12922 | LIBS="-lintl $LIBS" |
| @@ -12950,7 +12930,7 @@ done | |||
| 12950 | for ac_func in grantpt | 12930 | for ac_func in grantpt |
| 12951 | do : | 12931 | do : |
| 12952 | ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt" | 12932 | ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt" |
| 12953 | if test "x$ac_cv_func_grantpt" = xyes; then : | 12933 | if test "x$ac_cv_func_grantpt" = x""yes; then : |
| 12954 | cat >>confdefs.h <<_ACEOF | 12934 | cat >>confdefs.h <<_ACEOF |
| 12955 | #define HAVE_GRANTPT 1 | 12935 | #define HAVE_GRANTPT 1 |
| 12956 | _ACEOF | 12936 | _ACEOF |
| @@ -12963,7 +12943,7 @@ done | |||
| 12963 | for ac_func in getpt | 12943 | for ac_func in getpt |
| 12964 | do : | 12944 | do : |
| 12965 | ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt" | 12945 | ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt" |
| 12966 | if test "x$ac_cv_func_getpt" = xyes; then : | 12946 | if test "x$ac_cv_func_getpt" = x""yes; then : |
| 12967 | cat >>confdefs.h <<_ACEOF | 12947 | cat >>confdefs.h <<_ACEOF |
| 12968 | #define HAVE_GETPT 1 | 12948 | #define HAVE_GETPT 1 |
| 12969 | _ACEOF | 12949 | _ACEOF |
| @@ -12980,7 +12960,7 @@ done | |||
| 12980 | have_tputs_et_al=true | 12960 | have_tputs_et_al=true |
| 12981 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 | 12961 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 |
| 12982 | $as_echo_n "checking for library containing tputs... " >&6; } | 12962 | $as_echo_n "checking for library containing tputs... " >&6; } |
| 12983 | if ${ac_cv_search_tputs+:} false; then : | 12963 | if test "${ac_cv_search_tputs+set}" = set; then : |
| 12984 | $as_echo_n "(cached) " >&6 | 12964 | $as_echo_n "(cached) " >&6 |
| 12985 | else | 12965 | else |
| 12986 | ac_func_search_save_LIBS=$LIBS | 12966 | ac_func_search_save_LIBS=$LIBS |
| @@ -13014,11 +12994,11 @@ for ac_lib in '' ncurses terminfo termcap; do | |||
| 13014 | fi | 12994 | fi |
| 13015 | rm -f core conftest.err conftest.$ac_objext \ | 12995 | rm -f core conftest.err conftest.$ac_objext \ |
| 13016 | conftest$ac_exeext | 12996 | conftest$ac_exeext |
| 13017 | if ${ac_cv_search_tputs+:} false; then : | 12997 | if test "${ac_cv_search_tputs+set}" = set; then : |
| 13018 | break | 12998 | break |
| 13019 | fi | 12999 | fi |
| 13020 | done | 13000 | done |
| 13021 | if ${ac_cv_search_tputs+:} false; then : | 13001 | if test "${ac_cv_search_tputs+set}" = set; then : |
| 13022 | 13002 | ||
| 13023 | else | 13003 | else |
| 13024 | ac_cv_search_tputs=no | 13004 | ac_cv_search_tputs=no |
| @@ -13077,7 +13057,7 @@ case "$opsys" in | |||
| 13077 | freebsd) | 13057 | freebsd) |
| 13078 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5 | 13058 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5 |
| 13079 | $as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; } | 13059 | $as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; } |
| 13080 | if ${emacs_cv_freebsd_terminfo+:} false; then : | 13060 | if test "${emacs_cv_freebsd_terminfo+set}" = set; then : |
| 13081 | $as_echo_n "(cached) " >&6 | 13061 | $as_echo_n "(cached) " >&6 |
| 13082 | else | 13062 | else |
| 13083 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 13063 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -13219,16 +13199,16 @@ LIBHESIOD= | |||
| 13219 | if test "$with_hesiod" != no ; then | 13199 | if test "$with_hesiod" != no ; then |
| 13220 | # Don't set $LIBS here -- see comments above. FIXME which comments? | 13200 | # Don't set $LIBS here -- see comments above. FIXME which comments? |
| 13221 | ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send" | 13201 | ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send" |
| 13222 | if test "x$ac_cv_func_res_send" = xyes; then : | 13202 | if test "x$ac_cv_func_res_send" = x""yes; then : |
| 13223 | 13203 | ||
| 13224 | else | 13204 | else |
| 13225 | ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send" | 13205 | ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send" |
| 13226 | if test "x$ac_cv_func___res_send" = xyes; then : | 13206 | if test "x$ac_cv_func___res_send" = x""yes; then : |
| 13227 | 13207 | ||
| 13228 | else | 13208 | else |
| 13229 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5 | 13209 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5 |
| 13230 | $as_echo_n "checking for res_send in -lresolv... " >&6; } | 13210 | $as_echo_n "checking for res_send in -lresolv... " >&6; } |
| 13231 | if ${ac_cv_lib_resolv_res_send+:} false; then : | 13211 | if test "${ac_cv_lib_resolv_res_send+set}" = set; then : |
| 13232 | $as_echo_n "(cached) " >&6 | 13212 | $as_echo_n "(cached) " >&6 |
| 13233 | else | 13213 | else |
| 13234 | ac_check_lib_save_LIBS=$LIBS | 13214 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13262,12 +13242,12 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13262 | fi | 13242 | fi |
| 13263 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5 | 13243 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5 |
| 13264 | $as_echo "$ac_cv_lib_resolv_res_send" >&6; } | 13244 | $as_echo "$ac_cv_lib_resolv_res_send" >&6; } |
| 13265 | if test "x$ac_cv_lib_resolv_res_send" = xyes; then : | 13245 | if test "x$ac_cv_lib_resolv_res_send" = x""yes; then : |
| 13266 | resolv=yes | 13246 | resolv=yes |
| 13267 | else | 13247 | else |
| 13268 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5 | 13248 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5 |
| 13269 | $as_echo_n "checking for __res_send in -lresolv... " >&6; } | 13249 | $as_echo_n "checking for __res_send in -lresolv... " >&6; } |
| 13270 | if ${ac_cv_lib_resolv___res_send+:} false; then : | 13250 | if test "${ac_cv_lib_resolv___res_send+set}" = set; then : |
| 13271 | $as_echo_n "(cached) " >&6 | 13251 | $as_echo_n "(cached) " >&6 |
| 13272 | else | 13252 | else |
| 13273 | ac_check_lib_save_LIBS=$LIBS | 13253 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13301,7 +13281,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13301 | fi | 13281 | fi |
| 13302 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5 | 13282 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5 |
| 13303 | $as_echo "$ac_cv_lib_resolv___res_send" >&6; } | 13283 | $as_echo "$ac_cv_lib_resolv___res_send" >&6; } |
| 13304 | if test "x$ac_cv_lib_resolv___res_send" = xyes; then : | 13284 | if test "x$ac_cv_lib_resolv___res_send" = x""yes; then : |
| 13305 | resolv=yes | 13285 | resolv=yes |
| 13306 | fi | 13286 | fi |
| 13307 | 13287 | ||
| @@ -13317,12 +13297,12 @@ fi | |||
| 13317 | RESOLVLIB= | 13297 | RESOLVLIB= |
| 13318 | fi | 13298 | fi |
| 13319 | ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost" | 13299 | ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost" |
| 13320 | if test "x$ac_cv_func_hes_getmailhost" = xyes; then : | 13300 | if test "x$ac_cv_func_hes_getmailhost" = x""yes; then : |
| 13321 | 13301 | ||
| 13322 | else | 13302 | else |
| 13323 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5 | 13303 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5 |
| 13324 | $as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; } | 13304 | $as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; } |
| 13325 | if ${ac_cv_lib_hesiod_hes_getmailhost+:} false; then : | 13305 | if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then : |
| 13326 | $as_echo_n "(cached) " >&6 | 13306 | $as_echo_n "(cached) " >&6 |
| 13327 | else | 13307 | else |
| 13328 | ac_check_lib_save_LIBS=$LIBS | 13308 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13356,7 +13336,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13356 | fi | 13336 | fi |
| 13357 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 | 13337 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 |
| 13358 | $as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } | 13338 | $as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } |
| 13359 | if test "x$ac_cv_lib_hesiod_hes_getmailhost" = xyes; then : | 13339 | if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then : |
| 13360 | hesiod=yes | 13340 | hesiod=yes |
| 13361 | else | 13341 | else |
| 13362 | : | 13342 | : |
| @@ -13395,7 +13375,7 @@ KRB4LIB= | |||
| 13395 | if test "${with_kerberos}" != no; then | 13375 | if test "${with_kerberos}" != no; then |
| 13396 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5 | 13376 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5 |
| 13397 | $as_echo_n "checking for com_err in -lcom_err... " >&6; } | 13377 | $as_echo_n "checking for com_err in -lcom_err... " >&6; } |
| 13398 | if ${ac_cv_lib_com_err_com_err+:} false; then : | 13378 | if test "${ac_cv_lib_com_err_com_err+set}" = set; then : |
| 13399 | $as_echo_n "(cached) " >&6 | 13379 | $as_echo_n "(cached) " >&6 |
| 13400 | else | 13380 | else |
| 13401 | ac_check_lib_save_LIBS=$LIBS | 13381 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13429,7 +13409,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13429 | fi | 13409 | fi |
| 13430 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5 | 13410 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5 |
| 13431 | $as_echo "$ac_cv_lib_com_err_com_err" >&6; } | 13411 | $as_echo "$ac_cv_lib_com_err_com_err" >&6; } |
| 13432 | if test "x$ac_cv_lib_com_err_com_err" = xyes; then : | 13412 | if test "x$ac_cv_lib_com_err_com_err" = x""yes; then : |
| 13433 | have_com_err=yes | 13413 | have_com_err=yes |
| 13434 | else | 13414 | else |
| 13435 | have_com_err=no | 13415 | have_com_err=no |
| @@ -13444,7 +13424,7 @@ $as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h | |||
| 13444 | fi | 13424 | fi |
| 13445 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 | 13425 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 |
| 13446 | $as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } | 13426 | $as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } |
| 13447 | if ${ac_cv_lib_crypto_mit_des_cbc_encrypt+:} false; then : | 13427 | if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then : |
| 13448 | $as_echo_n "(cached) " >&6 | 13428 | $as_echo_n "(cached) " >&6 |
| 13449 | else | 13429 | else |
| 13450 | ac_check_lib_save_LIBS=$LIBS | 13430 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13478,7 +13458,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13478 | fi | 13458 | fi |
| 13479 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 | 13459 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 |
| 13480 | $as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } | 13460 | $as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } |
| 13481 | if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = xyes; then : | 13461 | if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then : |
| 13482 | have_crypto=yes | 13462 | have_crypto=yes |
| 13483 | else | 13463 | else |
| 13484 | have_crypto=no | 13464 | have_crypto=no |
| @@ -13493,7 +13473,7 @@ $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h | |||
| 13493 | fi | 13473 | fi |
| 13494 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 | 13474 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 |
| 13495 | $as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } | 13475 | $as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } |
| 13496 | if ${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+:} false; then : | 13476 | if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then : |
| 13497 | $as_echo_n "(cached) " >&6 | 13477 | $as_echo_n "(cached) " >&6 |
| 13498 | else | 13478 | else |
| 13499 | ac_check_lib_save_LIBS=$LIBS | 13479 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13527,7 +13507,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13527 | fi | 13507 | fi |
| 13528 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 | 13508 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 |
| 13529 | $as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } | 13509 | $as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } |
| 13530 | if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = xyes; then : | 13510 | if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then : |
| 13531 | have_k5crypto=yes | 13511 | have_k5crypto=yes |
| 13532 | else | 13512 | else |
| 13533 | have_k5crypto=no | 13513 | have_k5crypto=no |
| @@ -13542,7 +13522,7 @@ $as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h | |||
| 13542 | fi | 13522 | fi |
| 13543 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 | 13523 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 |
| 13544 | $as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } | 13524 | $as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } |
| 13545 | if ${ac_cv_lib_krb5_krb5_init_context+:} false; then : | 13525 | if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then : |
| 13546 | $as_echo_n "(cached) " >&6 | 13526 | $as_echo_n "(cached) " >&6 |
| 13547 | else | 13527 | else |
| 13548 | ac_check_lib_save_LIBS=$LIBS | 13528 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13576,7 +13556,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13576 | fi | 13556 | fi |
| 13577 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5 | 13557 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5 |
| 13578 | $as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } | 13558 | $as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } |
| 13579 | if test "x$ac_cv_lib_krb5_krb5_init_context" = xyes; then : | 13559 | if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then : |
| 13580 | have_krb5=yes | 13560 | have_krb5=yes |
| 13581 | else | 13561 | else |
| 13582 | have_krb5=no | 13562 | have_krb5=no |
| @@ -13592,7 +13572,7 @@ $as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h | |||
| 13592 | if test "${with_kerberos5}" = no; then | 13572 | if test "${with_kerberos5}" = no; then |
| 13593 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 | 13573 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 |
| 13594 | $as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; } | 13574 | $as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; } |
| 13595 | if ${ac_cv_lib_des425_des_cbc_encrypt+:} false; then : | 13575 | if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then : |
| 13596 | $as_echo_n "(cached) " >&6 | 13576 | $as_echo_n "(cached) " >&6 |
| 13597 | else | 13577 | else |
| 13598 | ac_check_lib_save_LIBS=$LIBS | 13578 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13626,7 +13606,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13626 | fi | 13606 | fi |
| 13627 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 | 13607 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 |
| 13628 | $as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } | 13608 | $as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } |
| 13629 | if test "x$ac_cv_lib_des425_des_cbc_encrypt" = xyes; then : | 13609 | if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then : |
| 13630 | have_des425=yes | 13610 | have_des425=yes |
| 13631 | else | 13611 | else |
| 13632 | have_des425=no | 13612 | have_des425=no |
| @@ -13641,7 +13621,7 @@ $as_echo "#define HAVE_LIBDES425 1" >>confdefs.h | |||
| 13641 | else | 13621 | else |
| 13642 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 | 13622 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 |
| 13643 | $as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } | 13623 | $as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } |
| 13644 | if ${ac_cv_lib_des_des_cbc_encrypt+:} false; then : | 13624 | if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then : |
| 13645 | $as_echo_n "(cached) " >&6 | 13625 | $as_echo_n "(cached) " >&6 |
| 13646 | else | 13626 | else |
| 13647 | ac_check_lib_save_LIBS=$LIBS | 13627 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13675,7 +13655,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13675 | fi | 13655 | fi |
| 13676 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 | 13656 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 |
| 13677 | $as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } | 13657 | $as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } |
| 13678 | if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes; then : | 13658 | if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then : |
| 13679 | have_des=yes | 13659 | have_des=yes |
| 13680 | else | 13660 | else |
| 13681 | have_des=no | 13661 | have_des=no |
| @@ -13691,7 +13671,7 @@ $as_echo "#define HAVE_LIBDES 1" >>confdefs.h | |||
| 13691 | fi | 13671 | fi |
| 13692 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 | 13672 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 |
| 13693 | $as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; } | 13673 | $as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; } |
| 13694 | if ${ac_cv_lib_krb4_krb_get_cred+:} false; then : | 13674 | if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then : |
| 13695 | $as_echo_n "(cached) " >&6 | 13675 | $as_echo_n "(cached) " >&6 |
| 13696 | else | 13676 | else |
| 13697 | ac_check_lib_save_LIBS=$LIBS | 13677 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13725,7 +13705,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13725 | fi | 13705 | fi |
| 13726 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5 | 13706 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5 |
| 13727 | $as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } | 13707 | $as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } |
| 13728 | if test "x$ac_cv_lib_krb4_krb_get_cred" = xyes; then : | 13708 | if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then : |
| 13729 | have_krb4=yes | 13709 | have_krb4=yes |
| 13730 | else | 13710 | else |
| 13731 | have_krb4=no | 13711 | have_krb4=no |
| @@ -13740,7 +13720,7 @@ $as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h | |||
| 13740 | else | 13720 | else |
| 13741 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 | 13721 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 |
| 13742 | $as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } | 13722 | $as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } |
| 13743 | if ${ac_cv_lib_krb_krb_get_cred+:} false; then : | 13723 | if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then : |
| 13744 | $as_echo_n "(cached) " >&6 | 13724 | $as_echo_n "(cached) " >&6 |
| 13745 | else | 13725 | else |
| 13746 | ac_check_lib_save_LIBS=$LIBS | 13726 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13774,7 +13754,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13774 | fi | 13754 | fi |
| 13775 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5 | 13755 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5 |
| 13776 | $as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } | 13756 | $as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } |
| 13777 | if test "x$ac_cv_lib_krb_krb_get_cred" = xyes; then : | 13757 | if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then : |
| 13778 | have_krb=yes | 13758 | have_krb=yes |
| 13779 | else | 13759 | else |
| 13780 | have_krb=no | 13760 | have_krb=no |
| @@ -13794,13 +13774,13 @@ $as_echo "#define HAVE_LIBKRB 1" >>confdefs.h | |||
| 13794 | for ac_header in krb5.h | 13774 | for ac_header in krb5.h |
| 13795 | do : | 13775 | do : |
| 13796 | ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" | 13776 | ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" |
| 13797 | if test "x$ac_cv_header_krb5_h" = xyes; then : | 13777 | if test "x$ac_cv_header_krb5_h" = x""yes; then : |
| 13798 | cat >>confdefs.h <<_ACEOF | 13778 | cat >>confdefs.h <<_ACEOF |
| 13799 | #define HAVE_KRB5_H 1 | 13779 | #define HAVE_KRB5_H 1 |
| 13800 | _ACEOF | 13780 | _ACEOF |
| 13801 | ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include <krb5.h> | 13781 | ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include <krb5.h> |
| 13802 | " | 13782 | " |
| 13803 | if test "x$ac_cv_member_krb5_error_text" = xyes; then : | 13783 | if test "x$ac_cv_member_krb5_error_text" = x""yes; then : |
| 13804 | 13784 | ||
| 13805 | cat >>confdefs.h <<_ACEOF | 13785 | cat >>confdefs.h <<_ACEOF |
| 13806 | #define HAVE_KRB5_ERROR_TEXT 1 | 13786 | #define HAVE_KRB5_ERROR_TEXT 1 |
| @@ -13810,7 +13790,7 @@ _ACEOF | |||
| 13810 | fi | 13790 | fi |
| 13811 | ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include <krb5.h> | 13791 | ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include <krb5.h> |
| 13812 | " | 13792 | " |
| 13813 | if test "x$ac_cv_member_krb5_error_e_text" = xyes; then : | 13793 | if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then : |
| 13814 | 13794 | ||
| 13815 | cat >>confdefs.h <<_ACEOF | 13795 | cat >>confdefs.h <<_ACEOF |
| 13816 | #define HAVE_KRB5_ERROR_E_TEXT 1 | 13796 | #define HAVE_KRB5_ERROR_E_TEXT 1 |
| @@ -13827,7 +13807,7 @@ done | |||
| 13827 | for ac_header in des.h | 13807 | for ac_header in des.h |
| 13828 | do : | 13808 | do : |
| 13829 | ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" | 13809 | ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" |
| 13830 | if test "x$ac_cv_header_des_h" = xyes; then : | 13810 | if test "x$ac_cv_header_des_h" = x""yes; then : |
| 13831 | cat >>confdefs.h <<_ACEOF | 13811 | cat >>confdefs.h <<_ACEOF |
| 13832 | #define HAVE_DES_H 1 | 13812 | #define HAVE_DES_H 1 |
| 13833 | _ACEOF | 13813 | _ACEOF |
| @@ -13836,7 +13816,7 @@ else | |||
| 13836 | for ac_header in kerberosIV/des.h | 13816 | for ac_header in kerberosIV/des.h |
| 13837 | do : | 13817 | do : |
| 13838 | ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" | 13818 | ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" |
| 13839 | if test "x$ac_cv_header_kerberosIV_des_h" = xyes; then : | 13819 | if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then : |
| 13840 | cat >>confdefs.h <<_ACEOF | 13820 | cat >>confdefs.h <<_ACEOF |
| 13841 | #define HAVE_KERBEROSIV_DES_H 1 | 13821 | #define HAVE_KERBEROSIV_DES_H 1 |
| 13842 | _ACEOF | 13822 | _ACEOF |
| @@ -13845,7 +13825,7 @@ else | |||
| 13845 | for ac_header in kerberos/des.h | 13825 | for ac_header in kerberos/des.h |
| 13846 | do : | 13826 | do : |
| 13847 | ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" | 13827 | ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" |
| 13848 | if test "x$ac_cv_header_kerberos_des_h" = xyes; then : | 13828 | if test "x$ac_cv_header_kerberos_des_h" = x""yes; then : |
| 13849 | cat >>confdefs.h <<_ACEOF | 13829 | cat >>confdefs.h <<_ACEOF |
| 13850 | #define HAVE_KERBEROS_DES_H 1 | 13830 | #define HAVE_KERBEROS_DES_H 1 |
| 13851 | _ACEOF | 13831 | _ACEOF |
| @@ -13865,7 +13845,7 @@ done | |||
| 13865 | for ac_header in krb.h | 13845 | for ac_header in krb.h |
| 13866 | do : | 13846 | do : |
| 13867 | ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" | 13847 | ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" |
| 13868 | if test "x$ac_cv_header_krb_h" = xyes; then : | 13848 | if test "x$ac_cv_header_krb_h" = x""yes; then : |
| 13869 | cat >>confdefs.h <<_ACEOF | 13849 | cat >>confdefs.h <<_ACEOF |
| 13870 | #define HAVE_KRB_H 1 | 13850 | #define HAVE_KRB_H 1 |
| 13871 | _ACEOF | 13851 | _ACEOF |
| @@ -13874,7 +13854,7 @@ else | |||
| 13874 | for ac_header in kerberosIV/krb.h | 13854 | for ac_header in kerberosIV/krb.h |
| 13875 | do : | 13855 | do : |
| 13876 | ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default" | 13856 | ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default" |
| 13877 | if test "x$ac_cv_header_kerberosIV_krb_h" = xyes; then : | 13857 | if test "x$ac_cv_header_kerberosIV_krb_h" = x""yes; then : |
| 13878 | cat >>confdefs.h <<_ACEOF | 13858 | cat >>confdefs.h <<_ACEOF |
| 13879 | #define HAVE_KERBEROSIV_KRB_H 1 | 13859 | #define HAVE_KERBEROSIV_KRB_H 1 |
| 13880 | _ACEOF | 13860 | _ACEOF |
| @@ -13883,7 +13863,7 @@ else | |||
| 13883 | for ac_header in kerberos/krb.h | 13863 | for ac_header in kerberos/krb.h |
| 13884 | do : | 13864 | do : |
| 13885 | ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default" | 13865 | ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default" |
| 13886 | if test "x$ac_cv_header_kerberos_krb_h" = xyes; then : | 13866 | if test "x$ac_cv_header_kerberos_krb_h" = x""yes; then : |
| 13887 | cat >>confdefs.h <<_ACEOF | 13867 | cat >>confdefs.h <<_ACEOF |
| 13888 | #define HAVE_KERBEROS_KRB_H 1 | 13868 | #define HAVE_KERBEROS_KRB_H 1 |
| 13889 | _ACEOF | 13869 | _ACEOF |
| @@ -13904,7 +13884,7 @@ done | |||
| 13904 | for ac_header in com_err.h | 13884 | for ac_header in com_err.h |
| 13905 | do : | 13885 | do : |
| 13906 | ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default" | 13886 | ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default" |
| 13907 | if test "x$ac_cv_header_com_err_h" = xyes; then : | 13887 | if test "x$ac_cv_header_com_err_h" = x""yes; then : |
| 13908 | cat >>confdefs.h <<_ACEOF | 13888 | cat >>confdefs.h <<_ACEOF |
| 13909 | #define HAVE_COM_ERR_H 1 | 13889 | #define HAVE_COM_ERR_H 1 |
| 13910 | _ACEOF | 13890 | _ACEOF |
| @@ -13925,7 +13905,7 @@ fi | |||
| 13925 | # to return localized messages. | 13905 | # to return localized messages. |
| 13926 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 | 13906 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 |
| 13927 | $as_echo_n "checking for dgettext in -lintl... " >&6; } | 13907 | $as_echo_n "checking for dgettext in -lintl... " >&6; } |
| 13928 | if ${ac_cv_lib_intl_dgettext+:} false; then : | 13908 | if test "${ac_cv_lib_intl_dgettext+set}" = set; then : |
| 13929 | $as_echo_n "(cached) " >&6 | 13909 | $as_echo_n "(cached) " >&6 |
| 13930 | else | 13910 | else |
| 13931 | ac_check_lib_save_LIBS=$LIBS | 13911 | ac_check_lib_save_LIBS=$LIBS |
| @@ -13959,7 +13939,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13959 | fi | 13939 | fi |
| 13960 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 | 13940 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 |
| 13961 | $as_echo "$ac_cv_lib_intl_dgettext" >&6; } | 13941 | $as_echo "$ac_cv_lib_intl_dgettext" >&6; } |
| 13962 | if test "x$ac_cv_lib_intl_dgettext" = xyes; then : | 13942 | if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : |
| 13963 | cat >>confdefs.h <<_ACEOF | 13943 | cat >>confdefs.h <<_ACEOF |
| 13964 | #define HAVE_LIBINTL 1 | 13944 | #define HAVE_LIBINTL 1 |
| 13965 | _ACEOF | 13945 | _ACEOF |
| @@ -13971,7 +13951,7 @@ fi | |||
| 13971 | 13951 | ||
| 13972 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5 | 13952 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5 |
| 13973 | $as_echo_n "checking whether localtime caches TZ... " >&6; } | 13953 | $as_echo_n "checking whether localtime caches TZ... " >&6; } |
| 13974 | if ${emacs_cv_localtime_cache+:} false; then : | 13954 | if test "${emacs_cv_localtime_cache+set}" = set; then : |
| 13975 | $as_echo_n "(cached) " >&6 | 13955 | $as_echo_n "(cached) " >&6 |
| 13976 | else | 13956 | else |
| 13977 | if test x$ac_cv_func_tzset = xyes; then | 13957 | if test x$ac_cv_func_tzset = xyes; then |
| @@ -14030,7 +14010,7 @@ if test "x$HAVE_TIMEVAL" = xyes; then | |||
| 14030 | for ac_func in gettimeofday | 14010 | for ac_func in gettimeofday |
| 14031 | do : | 14011 | do : |
| 14032 | ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" | 14012 | ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" |
| 14033 | if test "x$ac_cv_func_gettimeofday" = xyes; then : | 14013 | if test "x$ac_cv_func_gettimeofday" = x""yes; then : |
| 14034 | cat >>confdefs.h <<_ACEOF | 14014 | cat >>confdefs.h <<_ACEOF |
| 14035 | #define HAVE_GETTIMEOFDAY 1 | 14015 | #define HAVE_GETTIMEOFDAY 1 |
| 14036 | _ACEOF | 14016 | _ACEOF |
| @@ -14041,7 +14021,7 @@ done | |||
| 14041 | if test $ac_cv_func_gettimeofday = yes; then | 14021 | if test $ac_cv_func_gettimeofday = yes; then |
| 14042 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5 | 14022 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5 |
| 14043 | $as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; } | 14023 | $as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; } |
| 14044 | if ${emacs_cv_gettimeofday_two_arguments+:} false; then : | 14024 | if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then : |
| 14045 | $as_echo_n "(cached) " >&6 | 14025 | $as_echo_n "(cached) " >&6 |
| 14046 | else | 14026 | else |
| 14047 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 14027 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -14085,7 +14065,7 @@ fi | |||
| 14085 | 14065 | ||
| 14086 | ok_so_far=yes | 14066 | ok_so_far=yes |
| 14087 | ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" | 14067 | ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" |
| 14088 | if test "x$ac_cv_func_socket" = xyes; then : | 14068 | if test "x$ac_cv_func_socket" = x""yes; then : |
| 14089 | 14069 | ||
| 14090 | else | 14070 | else |
| 14091 | ok_so_far=no | 14071 | ok_so_far=no |
| @@ -14093,7 +14073,7 @@ fi | |||
| 14093 | 14073 | ||
| 14094 | if test $ok_so_far = yes; then | 14074 | if test $ok_so_far = yes; then |
| 14095 | ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" | 14075 | ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" |
| 14096 | if test "x$ac_cv_header_netinet_in_h" = xyes; then : | 14076 | if test "x$ac_cv_header_netinet_in_h" = x""yes; then : |
| 14097 | 14077 | ||
| 14098 | else | 14078 | else |
| 14099 | ok_so_far=no | 14079 | ok_so_far=no |
| @@ -14103,7 +14083,7 @@ fi | |||
| 14103 | fi | 14083 | fi |
| 14104 | if test $ok_so_far = yes; then | 14084 | if test $ok_so_far = yes; then |
| 14105 | ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" | 14085 | ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" |
| 14106 | if test "x$ac_cv_header_arpa_inet_h" = xyes; then : | 14086 | if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : |
| 14107 | 14087 | ||
| 14108 | else | 14088 | else |
| 14109 | ok_so_far=no | 14089 | ok_so_far=no |
| @@ -14120,7 +14100,7 @@ fi | |||
| 14120 | for ac_header in sys/ioctl.h | 14100 | for ac_header in sys/ioctl.h |
| 14121 | do : | 14101 | do : |
| 14122 | ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" | 14102 | ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" |
| 14123 | if test "x$ac_cv_header_sys_ioctl_h" = xyes; then : | 14103 | if test "x$ac_cv_header_sys_ioctl_h" = x""yes; then : |
| 14124 | cat >>confdefs.h <<_ACEOF | 14104 | cat >>confdefs.h <<_ACEOF |
| 14125 | #define HAVE_SYS_IOCTL_H 1 | 14105 | #define HAVE_SYS_IOCTL_H 1 |
| 14126 | _ACEOF | 14106 | _ACEOF |
| @@ -14150,7 +14130,7 @@ $as_echo "no" >&6; } | |||
| 14150 | fi | 14130 | fi |
| 14151 | 14131 | ||
| 14152 | ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" | 14132 | ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" |
| 14153 | if test "x$ac_cv_type_pid_t" = xyes; then : | 14133 | if test "x$ac_cv_type_pid_t" = x""yes; then : |
| 14154 | 14134 | ||
| 14155 | else | 14135 | else |
| 14156 | 14136 | ||
| @@ -14163,7 +14143,7 @@ fi | |||
| 14163 | for ac_header in vfork.h | 14143 | for ac_header in vfork.h |
| 14164 | do : | 14144 | do : |
| 14165 | ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" | 14145 | ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" |
| 14166 | if test "x$ac_cv_header_vfork_h" = xyes; then : | 14146 | if test "x$ac_cv_header_vfork_h" = x""yes; then : |
| 14167 | cat >>confdefs.h <<_ACEOF | 14147 | cat >>confdefs.h <<_ACEOF |
| 14168 | #define HAVE_VFORK_H 1 | 14148 | #define HAVE_VFORK_H 1 |
| 14169 | _ACEOF | 14149 | _ACEOF |
| @@ -14187,7 +14167,7 @@ done | |||
| 14187 | if test "x$ac_cv_func_fork" = xyes; then | 14167 | if test "x$ac_cv_func_fork" = xyes; then |
| 14188 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 | 14168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 |
| 14189 | $as_echo_n "checking for working fork... " >&6; } | 14169 | $as_echo_n "checking for working fork... " >&6; } |
| 14190 | if ${ac_cv_func_fork_works+:} false; then : | 14170 | if test "${ac_cv_func_fork_works+set}" = set; then : |
| 14191 | $as_echo_n "(cached) " >&6 | 14171 | $as_echo_n "(cached) " >&6 |
| 14192 | else | 14172 | else |
| 14193 | if test "$cross_compiling" = yes; then : | 14173 | if test "$cross_compiling" = yes; then : |
| @@ -14240,7 +14220,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork | |||
| 14240 | if test "x$ac_cv_func_vfork" = xyes; then | 14220 | if test "x$ac_cv_func_vfork" = xyes; then |
| 14241 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 | 14221 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 |
| 14242 | $as_echo_n "checking for working vfork... " >&6; } | 14222 | $as_echo_n "checking for working vfork... " >&6; } |
| 14243 | if ${ac_cv_func_vfork_works+:} false; then : | 14223 | if test "${ac_cv_func_vfork_works+set}" = set; then : |
| 14244 | $as_echo_n "(cached) " >&6 | 14224 | $as_echo_n "(cached) " >&6 |
| 14245 | else | 14225 | else |
| 14246 | if test "$cross_compiling" = yes; then : | 14226 | if test "$cross_compiling" = yes; then : |
| @@ -14376,7 +14356,7 @@ fi | |||
| 14376 | 14356 | ||
| 14377 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 | 14357 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 |
| 14378 | $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } | 14358 | $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } |
| 14379 | if ${emacs_cv_langinfo_codeset+:} false; then : | 14359 | if test "${emacs_cv_langinfo_codeset+set}" = set; then : |
| 14380 | $as_echo_n "(cached) " >&6 | 14360 | $as_echo_n "(cached) " >&6 |
| 14381 | else | 14361 | else |
| 14382 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 14362 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -14408,7 +14388,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h | |||
| 14408 | fi | 14388 | fi |
| 14409 | 14389 | ||
| 14410 | ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" | 14390 | ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" |
| 14411 | if test "x$ac_cv_type_size_t" = xyes; then : | 14391 | if test "x$ac_cv_type_size_t" = x""yes; then : |
| 14412 | 14392 | ||
| 14413 | cat >>confdefs.h <<_ACEOF | 14393 | cat >>confdefs.h <<_ACEOF |
| 14414 | #define HAVE_SIZE_T 1 | 14394 | #define HAVE_SIZE_T 1 |
| @@ -14420,7 +14400,7 @@ fi | |||
| 14420 | 14400 | ||
| 14421 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 | 14401 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 |
| 14422 | $as_echo_n "checking for mbstate_t... " >&6; } | 14402 | $as_echo_n "checking for mbstate_t... " >&6; } |
| 14423 | if ${ac_cv_type_mbstate_t+:} false; then : | 14403 | if test "${ac_cv_type_mbstate_t+set}" = set; then : |
| 14424 | $as_echo_n "(cached) " >&6 | 14404 | $as_echo_n "(cached) " >&6 |
| 14425 | else | 14405 | else |
| 14426 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 14406 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -14456,7 +14436,7 @@ $as_echo "#define mbstate_t int" >>confdefs.h | |||
| 14456 | 14436 | ||
| 14457 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restrict keyword" >&5 | 14437 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restrict keyword" >&5 |
| 14458 | $as_echo_n "checking for C restrict keyword... " >&6; } | 14438 | $as_echo_n "checking for C restrict keyword... " >&6; } |
| 14459 | if ${emacs_cv_c_restrict+:} false; then : | 14439 | if test "${emacs_cv_c_restrict+set}" = set; then : |
| 14460 | $as_echo_n "(cached) " >&6 | 14440 | $as_echo_n "(cached) " >&6 |
| 14461 | else | 14441 | else |
| 14462 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 14442 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -14510,7 +14490,7 @@ fi | |||
| 14510 | 14490 | ||
| 14511 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5 | 14491 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5 |
| 14512 | $as_echo_n "checking for C restricted array declarations... " >&6; } | 14492 | $as_echo_n "checking for C restricted array declarations... " >&6; } |
| 14513 | if ${emacs_cv_c_restrict_arr+:} false; then : | 14493 | if test "${emacs_cv_c_restrict_arr+set}" = set; then : |
| 14514 | $as_echo_n "(cached) " >&6 | 14494 | $as_echo_n "(cached) " >&6 |
| 14515 | else | 14495 | else |
| 14516 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 14496 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| @@ -14550,7 +14530,7 @@ if test "x$GCC" = xyes \ | |||
| 14550 | && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ | 14530 | && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ |
| 14551 | && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ | 14531 | && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ |
| 14552 | && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then | 14532 | && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then |
| 14553 | as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 | 14533 | as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 |
| 14554 | fi | 14534 | fi |
| 14555 | 14535 | ||
| 14556 | #### Find out which version of Emacs this is. | 14536 | #### Find out which version of Emacs this is. |
| @@ -15019,11 +14999,6 @@ to run if these resources are not installed." | |||
| 15019 | echo | 14999 | echo |
| 15020 | fi | 15000 | fi |
| 15021 | 15001 | ||
| 15022 | if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then | ||
| 15023 | echo "D-Bus integration has been tested for GNU/Linux only." | ||
| 15024 | echo | ||
| 15025 | fi | ||
| 15026 | |||
| 15027 | 15002 | ||
| 15028 | # Remove any trailing slashes in these variables. | 15003 | # Remove any trailing slashes in these variables. |
| 15029 | test "${prefix}" != NONE && | 15004 | test "${prefix}" != NONE && |
| @@ -15099,21 +15074,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | |||
| 15099 | :end' >>confcache | 15074 | :end' >>confcache |
| 15100 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | 15075 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else |
| 15101 | if test -w "$cache_file"; then | 15076 | if test -w "$cache_file"; then |
| 15102 | if test "x$cache_file" != "x/dev/null"; then | 15077 | test "x$cache_file" != "x/dev/null" && |
| 15103 | { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 | 15078 | { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 |
| 15104 | $as_echo "$as_me: updating cache $cache_file" >&6;} | 15079 | $as_echo "$as_me: updating cache $cache_file" >&6;} |
| 15105 | if test ! -f "$cache_file" || test -h "$cache_file"; then | 15080 | cat confcache >$cache_file |
| 15106 | cat confcache >"$cache_file" | ||
| 15107 | else | ||
| 15108 | case $cache_file in #( | ||
| 15109 | */* | ?:*) | ||
| 15110 | mv -f confcache "$cache_file"$$ && | ||
| 15111 | mv -f "$cache_file"$$ "$cache_file" ;; #( | ||
| 15112 | *) | ||
| 15113 | mv -f confcache "$cache_file" ;; | ||
| 15114 | esac | ||
| 15115 | fi | ||
| 15116 | fi | ||
| 15117 | else | 15081 | else |
| 15118 | { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 | 15082 | { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 |
| 15119 | $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} | 15083 | $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
| @@ -15146,7 +15110,7 @@ LTLIBOBJS=$ac_ltlibobjs | |||
| 15146 | 15110 | ||
| 15147 | 15111 | ||
| 15148 | 15112 | ||
| 15149 | : "${CONFIG_STATUS=./config.status}" | 15113 | : ${CONFIG_STATUS=./config.status} |
| 15150 | ac_write_fail=0 | 15114 | ac_write_fail=0 |
| 15151 | ac_clean_files_save=$ac_clean_files | 15115 | ac_clean_files_save=$ac_clean_files |
| 15152 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | 15116 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
| @@ -15247,7 +15211,6 @@ fi | |||
| 15247 | IFS=" "" $as_nl" | 15211 | IFS=" "" $as_nl" |
| 15248 | 15212 | ||
| 15249 | # Find who we are. Look in the path if we contain no directory separator. | 15213 | # Find who we are. Look in the path if we contain no directory separator. |
| 15250 | as_myself= | ||
| 15251 | case $0 in #(( | 15214 | case $0 in #(( |
| 15252 | *[\\/]* ) as_myself=$0 ;; | 15215 | *[\\/]* ) as_myself=$0 ;; |
| 15253 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | 15216 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| @@ -15555,7 +15518,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
| 15555 | # values after options handling. | 15518 | # values after options handling. |
| 15556 | ac_log=" | 15519 | ac_log=" |
| 15557 | This file was extended by emacs $as_me 24.0.50, which was | 15520 | This file was extended by emacs $as_me 24.0.50, which was |
| 15558 | generated by GNU Autoconf 2.68. Invocation command line was | 15521 | generated by GNU Autoconf 2.67. Invocation command line was |
| 15559 | 15522 | ||
| 15560 | CONFIG_FILES = $CONFIG_FILES | 15523 | CONFIG_FILES = $CONFIG_FILES |
| 15561 | CONFIG_HEADERS = $CONFIG_HEADERS | 15524 | CONFIG_HEADERS = $CONFIG_HEADERS |
| @@ -15621,7 +15584,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
| 15621 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 15584 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| 15622 | ac_cs_version="\\ | 15585 | ac_cs_version="\\ |
| 15623 | emacs config.status 24.0.50 | 15586 | emacs config.status 24.0.50 |
| 15624 | configured by $0, generated by GNU Autoconf 2.68, | 15587 | configured by $0, generated by GNU Autoconf 2.67, |
| 15625 | with options \\"\$ac_cs_config\\" | 15588 | with options \\"\$ac_cs_config\\" |
| 15626 | 15589 | ||
| 15627 | Copyright (C) 2010 Free Software Foundation, Inc. | 15590 | Copyright (C) 2010 Free Software Foundation, Inc. |
| @@ -15761,7 +15724,7 @@ do | |||
| 15761 | "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; | 15724 | "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; |
| 15762 | "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; | 15725 | "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; |
| 15763 | 15726 | ||
| 15764 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 15727 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
| 15765 | esac | 15728 | esac |
| 15766 | done | 15729 | done |
| 15767 | 15730 | ||
| @@ -15784,10 +15747,9 @@ fi | |||
| 15784 | # after its creation but before its name has been assigned to `$tmp'. | 15747 | # after its creation but before its name has been assigned to `$tmp'. |
| 15785 | $debug || | 15748 | $debug || |
| 15786 | { | 15749 | { |
| 15787 | tmp= ac_tmp= | 15750 | tmp= |
| 15788 | trap 'exit_status=$? | 15751 | trap 'exit_status=$? |
| 15789 | : "${ac_tmp:=$tmp}" | 15752 | { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status |
| 15790 | { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status | ||
| 15791 | ' 0 | 15753 | ' 0 |
| 15792 | trap 'as_fn_exit 1' 1 2 13 15 | 15754 | trap 'as_fn_exit 1' 1 2 13 15 |
| 15793 | } | 15755 | } |
| @@ -15795,13 +15757,12 @@ $debug || | |||
| 15795 | 15757 | ||
| 15796 | { | 15758 | { |
| 15797 | tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && | 15759 | tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && |
| 15798 | test -d "$tmp" | 15760 | test -n "$tmp" && test -d "$tmp" |
| 15799 | } || | 15761 | } || |
| 15800 | { | 15762 | { |
| 15801 | tmp=./conf$$-$RANDOM | 15763 | tmp=./conf$$-$RANDOM |
| 15802 | (umask 077 && mkdir "$tmp") | 15764 | (umask 077 && mkdir "$tmp") |
| 15803 | } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 | 15765 | } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
| 15804 | ac_tmp=$tmp | ||
| 15805 | 15766 | ||
| 15806 | # Set up the scripts for CONFIG_FILES section. | 15767 | # Set up the scripts for CONFIG_FILES section. |
| 15807 | # No need to generate them if there are no CONFIG_FILES. | 15768 | # No need to generate them if there are no CONFIG_FILES. |
| @@ -15840,13 +15801,13 @@ else | |||
| 15840 | ac_cs_awk_cr=$ac_cr | 15801 | ac_cs_awk_cr=$ac_cr |
| 15841 | fi | 15802 | fi |
| 15842 | 15803 | ||
| 15843 | echo 'BEGIN {' >"$ac_tmp/subs1.awk" && | 15804 | echo 'BEGIN {' >"$tmp/subs1.awk" && |
| 15844 | _ACEOF | 15805 | _ACEOF |
| 15845 | 15806 | ||
| 15846 | # Create commands to substitute file output variables. | 15807 | # Create commands to substitute file output variables. |
| 15847 | { | 15808 | { |
| 15848 | echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" && | 15809 | echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" && |
| 15849 | echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' && | 15810 | echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' && |
| 15850 | echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' && | 15811 | echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' && |
| 15851 | echo "_ACAWK" && | 15812 | echo "_ACAWK" && |
| 15852 | echo "_ACEOF" | 15813 | echo "_ACEOF" |
| @@ -15879,7 +15840,7 @@ done | |||
| 15879 | rm -f conf$$subs.sh | 15840 | rm -f conf$$subs.sh |
| 15880 | 15841 | ||
| 15881 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 15842 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 15882 | cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && | 15843 | cat >>"\$tmp/subs1.awk" <<\\_ACAWK && |
| 15883 | _ACEOF | 15844 | _ACEOF |
| 15884 | sed -n ' | 15845 | sed -n ' |
| 15885 | h | 15846 | h |
| @@ -15927,7 +15888,7 @@ t delim | |||
| 15927 | rm -f conf$$subs.awk | 15888 | rm -f conf$$subs.awk |
| 15928 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 15889 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 15929 | _ACAWK | 15890 | _ACAWK |
| 15930 | cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && | 15891 | cat >>"\$tmp/subs1.awk" <<_ACAWK && |
| 15931 | for (key in S) S_is_set[key] = 1 | 15892 | for (key in S) S_is_set[key] = 1 |
| 15932 | FS = "" | 15893 | FS = "" |
| 15933 | \$ac_cs_awk_pipe_init | 15894 | \$ac_cs_awk_pipe_init |
| @@ -15965,7 +15926,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then | |||
| 15965 | sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" | 15926 | sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" |
| 15966 | else | 15927 | else |
| 15967 | cat | 15928 | cat |
| 15968 | fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ | 15929 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
| 15969 | || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 | 15930 | || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
| 15970 | _ACEOF | 15931 | _ACEOF |
| 15971 | 15932 | ||
| @@ -15999,7 +15960,7 @@ fi # test -n "$CONFIG_FILES" | |||
| 15999 | # No need to generate them if there are no CONFIG_HEADERS. | 15960 | # No need to generate them if there are no CONFIG_HEADERS. |
| 16000 | # This happens for instance with `./config.status Makefile'. | 15961 | # This happens for instance with `./config.status Makefile'. |
| 16001 | if test -n "$CONFIG_HEADERS"; then | 15962 | if test -n "$CONFIG_HEADERS"; then |
| 16002 | cat >"$ac_tmp/defines.awk" <<\_ACAWK || | 15963 | cat >"$tmp/defines.awk" <<\_ACAWK || |
| 16003 | BEGIN { | 15964 | BEGIN { |
| 16004 | _ACEOF | 15965 | _ACEOF |
| 16005 | 15966 | ||
| @@ -16011,8 +15972,8 @@ _ACEOF | |||
| 16011 | # handling of long lines. | 15972 | # handling of long lines. |
| 16012 | ac_delim='%!_!# ' | 15973 | ac_delim='%!_!# ' |
| 16013 | for ac_last_try in false false :; do | 15974 | for ac_last_try in false false :; do |
| 16014 | ac_tt=`sed -n "/$ac_delim/p" confdefs.h` | 15975 | ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
| 16015 | if test -z "$ac_tt"; then | 15976 | if test -z "$ac_t"; then |
| 16016 | break | 15977 | break |
| 16017 | elif $ac_last_try; then | 15978 | elif $ac_last_try; then |
| 16018 | as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 | 15979 | as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
| @@ -16113,7 +16074,7 @@ do | |||
| 16113 | esac | 16074 | esac |
| 16114 | case $ac_mode$ac_tag in | 16075 | case $ac_mode$ac_tag in |
| 16115 | :[FHL]*:*);; | 16076 | :[FHL]*:*);; |
| 16116 | :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; | 16077 | :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
| 16117 | :[FH]-) ac_tag=-:-;; | 16078 | :[FH]-) ac_tag=-:-;; |
| 16118 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | 16079 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
| 16119 | esac | 16080 | esac |
| @@ -16132,7 +16093,7 @@ do | |||
| 16132 | for ac_f | 16093 | for ac_f |
| 16133 | do | 16094 | do |
| 16134 | case $ac_f in | 16095 | case $ac_f in |
| 16135 | -) ac_f="$ac_tmp/stdin";; | 16096 | -) ac_f="$tmp/stdin";; |
| 16136 | *) # Look for the file first in the build tree, then in the source tree | 16097 | *) # Look for the file first in the build tree, then in the source tree |
| 16137 | # (if the path is not absolute). The absolute path cannot be DOS-style, | 16098 | # (if the path is not absolute). The absolute path cannot be DOS-style, |
| 16138 | # because $ac_f cannot contain `:'. | 16099 | # because $ac_f cannot contain `:'. |
| @@ -16141,7 +16102,7 @@ do | |||
| 16141 | [\\/$]*) false;; | 16102 | [\\/$]*) false;; |
| 16142 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | 16103 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
| 16143 | esac || | 16104 | esac || |
| 16144 | as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; | 16105 | as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
| 16145 | esac | 16106 | esac |
| 16146 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | 16107 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
| 16147 | as_fn_append ac_file_inputs " '$ac_f'" | 16108 | as_fn_append ac_file_inputs " '$ac_f'" |
| @@ -16167,8 +16128,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} | |||
| 16167 | esac | 16128 | esac |
| 16168 | 16129 | ||
| 16169 | case $ac_tag in | 16130 | case $ac_tag in |
| 16170 | *:-:* | *:-) cat >"$ac_tmp/stdin" \ | 16131 | *:-:* | *:-) cat >"$tmp/stdin" \ |
| 16171 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; | 16132 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
| 16172 | esac | 16133 | esac |
| 16173 | ;; | 16134 | ;; |
| 16174 | esac | 16135 | esac |
| @@ -16300,25 +16261,24 @@ $ac_datarootdir_hack | |||
| 16300 | " | 16261 | " |
| 16301 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | | 16262 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | |
| 16302 | if $ac_cs_awk_getline; then | 16263 | if $ac_cs_awk_getline; then |
| 16303 | $AWK -f "$ac_tmp/subs.awk" | 16264 | $AWK -f "$tmp/subs.awk" |
| 16304 | else | 16265 | else |
| 16305 | $AWK -f "$ac_tmp/subs.awk" | $SHELL | 16266 | $AWK -f "$tmp/subs.awk" | $SHELL |
| 16306 | fi \ | 16267 | fi >$tmp/out \ |
| 16307 | >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | 16268 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| 16308 | 16269 | ||
| 16309 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | 16270 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
| 16310 | { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && | 16271 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
| 16311 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ | 16272 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
| 16312 | "$ac_tmp/out"`; test -z "$ac_out"; } && | ||
| 16313 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 16273 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 16314 | which seems to be undefined. Please make sure it is defined" >&5 | 16274 | which seems to be undefined. Please make sure it is defined" >&5 |
| 16315 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 16275 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 16316 | which seems to be undefined. Please make sure it is defined" >&2;} | 16276 | which seems to be undefined. Please make sure it is defined" >&2;} |
| 16317 | 16277 | ||
| 16318 | rm -f "$ac_tmp/stdin" | 16278 | rm -f "$tmp/stdin" |
| 16319 | case $ac_file in | 16279 | case $ac_file in |
| 16320 | -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; | 16280 | -) cat "$tmp/out" && rm -f "$tmp/out";; |
| 16321 | *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; | 16281 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
| 16322 | esac \ | 16282 | esac \ |
| 16323 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | 16283 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| 16324 | ;; | 16284 | ;; |
| @@ -16329,20 +16289,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} | |||
| 16329 | if test x"$ac_file" != x-; then | 16289 | if test x"$ac_file" != x-; then |
| 16330 | { | 16290 | { |
| 16331 | $as_echo "/* $configure_input */" \ | 16291 | $as_echo "/* $configure_input */" \ |
| 16332 | && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" | 16292 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
| 16333 | } >"$ac_tmp/config.h" \ | 16293 | } >"$tmp/config.h" \ |
| 16334 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | 16294 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| 16335 | if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then | 16295 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
| 16336 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 | 16296 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
| 16337 | $as_echo "$as_me: $ac_file is unchanged" >&6;} | 16297 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
| 16338 | else | 16298 | else |
| 16339 | rm -f "$ac_file" | 16299 | rm -f "$ac_file" |
| 16340 | mv "$ac_tmp/config.h" "$ac_file" \ | 16300 | mv "$tmp/config.h" "$ac_file" \ |
| 16341 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 | 16301 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
| 16342 | fi | 16302 | fi |
| 16343 | else | 16303 | else |
| 16344 | $as_echo "/* $configure_input */" \ | 16304 | $as_echo "/* $configure_input */" \ |
| 16345 | && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ | 16305 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
| 16346 | || as_fn_error $? "could not create -" "$LINENO" 5 | 16306 | || as_fn_error $? "could not create -" "$LINENO" 5 |
| 16347 | fi | 16307 | fi |
| 16348 | ;; | 16308 | ;; |
diff --git a/configure.in b/configure.in index 3126a376600..c018db912ce 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -3737,11 +3737,6 @@ to run if these resources are not installed." | |||
| 3737 | echo | 3737 | echo |
| 3738 | fi | 3738 | fi |
| 3739 | 3739 | ||
| 3740 | if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then | ||
| 3741 | echo "D-Bus integration has been tested for GNU/Linux only." | ||
| 3742 | echo | ||
| 3743 | fi | ||
| 3744 | |||
| 3745 | 3740 | ||
| 3746 | # Remove any trailing slashes in these variables. | 3741 | # Remove any trailing slashes in these variables. |
| 3747 | [test "${prefix}" != NONE && | 3742 | [test "${prefix}" != NONE && |
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5c0ff3da206..fe9cd8a73b4 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * msdog.texi (Windows HOME): Add information regarding startup | ||
| 4 | directory when invoking Emacs from a desktop shortcut. (bug#7300) | ||
| 5 | |||
| 1 | 2010-10-11 Glenn Morris <rgm@gnu.org> | 6 | 2010-10-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (MAKEINFO): Add explicit -I$srcdir. | 8 | * Makefile.in (MAKEINFO): Add explicit -I$srcdir. |
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index a44438bf81f..3e8d5ef57c1 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi | |||
| @@ -31,7 +31,8 @@ here. | |||
| 31 | * Text and Binary:: Text files use CRLF to terminate lines. | 31 | * Text and Binary:: Text files use CRLF to terminate lines. |
| 32 | * Windows Files:: File-name conventions on Windows. | 32 | * Windows Files:: File-name conventions on Windows. |
| 33 | * ls in Lisp:: Emulation of @code{ls} for Dired. | 33 | * ls in Lisp:: Emulation of @code{ls} for Dired. |
| 34 | * Windows HOME:: Where Emacs looks for your @file{.emacs}. | 34 | * Windows HOME:: Where Emacs looks for your @file{.emacs} and |
| 35 | where it starts up. | ||
| 35 | * Windows Keyboard:: Windows-specific keyboard features. | 36 | * Windows Keyboard:: Windows-specific keyboard features. |
| 36 | * Windows Mouse:: Windows-specific mouse features. | 37 | * Windows Mouse:: Windows-specific mouse features. |
| 37 | * Windows Processes:: Running subprocesses on Windows. | 38 | * Windows Processes:: Running subprocesses on Windows. |
| @@ -329,7 +330,7 @@ names, which might cause misalignment of columns in Dired display. | |||
| 329 | @end ifnottex | 330 | @end ifnottex |
| 330 | 331 | ||
| 331 | @node Windows HOME | 332 | @node Windows HOME |
| 332 | @section HOME Directory on MS-Windows | 333 | @section HOME and Startup Directories on MS-Windows |
| 333 | @cindex @code{HOME} directory on MS-Windows | 334 | @cindex @code{HOME} directory on MS-Windows |
| 334 | 335 | ||
| 335 | The Windows equivalent of the @code{HOME} directory is the | 336 | The Windows equivalent of the @code{HOME} directory is the |
| @@ -371,6 +372,13 @@ names, the Windows port of Emacs supports an alternative name | |||
| 371 | @file{_emacs} as a fallback, if such a file exists in the home | 372 | @file{_emacs} as a fallback, if such a file exists in the home |
| 372 | directory, whereas @file{.emacs} does not. | 373 | directory, whereas @file{.emacs} does not. |
| 373 | 374 | ||
| 375 | @cindex start directory, MS-Windows | ||
| 376 | @cindex directory where Emacs starts on MS-Windows | ||
| 377 | If you use a Windows desktop shortcut to start Emacs, it starts in | ||
| 378 | the directory specified by the shortcut. To control where that is, | ||
| 379 | right-click on the shortcut, select ``Properties'', and in the | ||
| 380 | ``Shortcut'' tab modify the ``Start in'' field to your liking. | ||
| 381 | |||
| 374 | @node Windows Keyboard | 382 | @node Windows Keyboard |
| 375 | @section Keyboard Usage on MS-Windows | 383 | @section Keyboard Usage on MS-Windows |
| 376 | @cindex keyboard, MS-Windows | 384 | @cindex keyboard, MS-Windows |
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 9761e599d8f..e255b44f189 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-11-09 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc.texi: Use emacsver.texi to determine Emacs version. | ||
| 4 | |||
| 1 | 2010-11-04 Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 | 2010-11-04 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 6 | ||
| 3 | * gnus.texi (Customizing the IMAP Connection): Remove nnir mention, | 7 | * gnus.texi (Customizing the IMAP Connection): Remove nnir mention, |
diff --git a/etc/NEWS.23 b/etc/NEWS.23 index e1e7ba79d41..aa8f47f2e2b 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 | |||
| @@ -41,7 +41,10 @@ This can be used in place of the default appt-message-warning-time. | |||
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | * New Modes and Packages in Emacs 23.3 | 43 | * New Modes and Packages in Emacs 23.3 |
| 44 | 44 | ** smie.el is a generic navigation and indentation engine. | |
| 45 | It takes a simple BNF description of the grammar, and provides both | ||
| 46 | sexp-style navigation (jumping over begin..end pairs) as well as | ||
| 47 | indentation, which can be adjusted via ad-hoc indentation rules. | ||
| 45 | 48 | ||
| 46 | * Incompatible Lisp Changes in Emacs 23.3 | 49 | * Incompatible Lisp Changes in Emacs 23.3 |
| 47 | 50 | ||
| @@ -51,7 +54,7 @@ This can be used in place of the default appt-message-warning-time. | |||
| 51 | ** `e' and `pi' are now called `float-e' and `float-pi'. | 54 | ** `e' and `pi' are now called `float-e' and `float-pi'. |
| 52 | The old names are obsolete. | 55 | The old names are obsolete. |
| 53 | ** The use of unintern without an obarray arg is declared obsolete. | 56 | ** The use of unintern without an obarray arg is declared obsolete. |
| 54 | 57 | ** The function `princ-list' is declared obsolete. | |
| 55 | ** New function byte-to-string, like char-to-string but for bytes. | 58 | ** New function byte-to-string, like char-to-string but for bytes. |
| 56 | 59 | ||
| 57 | 60 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33d50961912..fa3bdfc3780 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,65 @@ | |||
| 1 | 2010-11-09 Glenn Morris <rgm@gnu.org> | 1 | 2010-11-09 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix. | ||
| 4 | |||
| 5 | 2010-11-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 6 | |||
| 7 | * minibuffer.el (minibuffer-completion-help): Specify the end of the | ||
| 8 | completion field (bug#7211). | ||
| 9 | |||
| 10 | * progmodes/python.el (python-font-lock-syntactic-keywords): (bug#7322) | ||
| 11 | Fix handling of backslash escapes. | ||
| 12 | (python-quote-syntax): Adjust accordingly. | ||
| 13 | |||
| 14 | 2010-11-09 Richard Levitte <richard@levitte.org> (tiny change) | ||
| 15 | 2010-11-09 Richard Levitte <richard@levitte.org> (tiny patch) | ||
| 16 | |||
| 17 | * vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status) | ||
| 18 | (vc-mtn-workfile-branch): Adjust to new output format. | ||
| 19 | |||
| 20 | 2010-11-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 21 | |||
| 22 | * international/mule-cmds.el (princ-list): Mark as obsolete. | ||
| 23 | |||
| 24 | 2010-11-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 25 | |||
| 26 | * emacs-lisp/smie.el: New package. | ||
| 27 | |||
| 28 | 2010-11-09 Michael Albinus <michael.albinus@gmx.de> | ||
| 29 | |||
| 30 | * files.el (backup-by-copying-when-mismatch): | ||
| 31 | Set `permanent-local' property. | ||
| 32 | |||
| 33 | * net/tramp.el (tramp-handle-insert-file-contents): Do not set | ||
| 34 | `permanent-local' property for `backup-by-copying-when-mismatch'. | ||
| 35 | |||
| 36 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> | ||
| 37 | |||
| 38 | * ls-lisp.el (insert-directory): Doc fix. (bug#7285) | ||
| 39 | |||
| 40 | 2010-11-09 Wilson Snyder <wsnyder@wsnyder.org> | ||
| 41 | |||
| 42 | * progmodes/verilog-mode.el (verilog-insert-one-definition) | ||
| 43 | (verilog-read-decls, verilog-read-sub-decls-sig): Fix AUTOWIRE and | ||
| 44 | AUTOINOUT for SV style multidimensional arrays, bug294. | ||
| 45 | Reported by Eric Mastromarchi. | ||
| 46 | (verilog-preprocess): Use with-current-buffer and | ||
| 47 | font-lock-fontify-buffer to cleanup style issues. | ||
| 48 | |||
| 49 | 2010-11-09 Glenn Morris <rgm@gnu.org> | ||
| 50 | |||
| 51 | * locate.el (locate, locate-mode): Doc fixes. | ||
| 52 | |||
| 53 | 2010-11-09 Chong Yidong <cyd@stupidchicken.com> | ||
| 54 | |||
| 55 | * server.el (server-start): New arg INHIBIT-PROMPT prevents asking | ||
| 56 | user for confirmation. | ||
| 57 | (server-force-stop): Use it. | ||
| 58 | (server-start): Use server-force-stop for kill-emacs-hook, to | ||
| 59 | avoid user interaction while killing Emacs. | ||
| 60 | |||
| 61 | 2010-11-09 Glenn Morris <rgm@gnu.org> | ||
| 62 | |||
| 3 | * progmodes/meta-mode.el: Remove leading `*' from defcustom docs. | 63 | * progmodes/meta-mode.el: Remove leading `*' from defcustom docs. |
| 4 | (meta-indent-line): Simplify. | 64 | (meta-indent-line): Simplify. |
| 5 | 65 | ||
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 2b2081a25d0..7c42d1a94b1 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -180,6 +180,7 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptags | |||
| 180 | els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ | 180 | els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ |
| 181 | ${ETAGS} -o $@ $$els | 181 | ${ETAGS} -o $@ $$els |
| 182 | 182 | ||
| 183 | $(lisp)/emacs-lisp/smie.elc \ | ||
| 183 | # The src/Makefile.in has its own set of dependencies and when they decide | 184 | # The src/Makefile.in has its own set of dependencies and when they decide |
| 184 | # that one Lisp file needs to be re-compiled, we had better recompile it as | 185 | # that one Lisp file needs to be re-compiled, we had better recompile it as |
| 185 | # well, otherwise every subsequent make will again call us, until we finally | 186 | # well, otherwise every subsequent make will again call us, until we finally |
diff --git a/lisp/dired.el b/lisp/dired.el index 345956f029f..04ba6083c21 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -3539,7 +3539,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." | |||
| 3539 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3539 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
| 3540 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3540 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
| 3541 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3541 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
| 3542 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "416d272299fd4774c47c2f677ee640a4") | 3542 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "1628b7a7d379fb4da8ae4bf29faad4b5") |
| 3543 | ;;; Generated autoloads from dired-aux.el | 3543 | ;;; Generated autoloads from dired-aux.el |
| 3544 | 3544 | ||
| 3545 | (autoload 'dired-diff "dired-aux" "\ | 3545 | (autoload 'dired-diff "dired-aux" "\ |
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 4bda6ceb759..b1d934f08e0 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el | |||
| @@ -282,7 +282,7 @@ Not documented | |||
| 282 | ;;;;;; do-all-symbols do-symbols dotimes dolist do* do loop return-from | 282 | ;;;;;; do-all-symbols do-symbols dotimes dolist do* do loop return-from |
| 283 | ;;;;;; return block etypecase typecase ecase case load-time-value | 283 | ;;;;;; return block etypecase typecase ecase case load-time-value |
| 284 | ;;;;;; eval-when destructuring-bind function* defmacro* defun* gentemp | 284 | ;;;;;; eval-when destructuring-bind function* defmacro* defun* gentemp |
| 285 | ;;;;;; gensym) "cl-macs" "cl-macs.el" "82f8370745a60dc26536a0237cba893f") | 285 | ;;;;;; gensym) "cl-macs" "cl-macs.el" "979862b54946a5fcbbccdd90fa3f84d8") |
| 286 | ;;; Generated autoloads from cl-macs.el | 286 | ;;; Generated autoloads from cl-macs.el |
| 287 | 287 | ||
| 288 | (autoload 'gensym "cl-macs" "\ | 288 | (autoload 'gensym "cl-macs" "\ |
diff --git a/lisp/files.el b/lisp/files.el index 0c5640d13a4..ca698cab33d 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -124,6 +124,7 @@ the default for a new file created there by you. | |||
| 124 | This variable is relevant only if `backup-by-copying' is nil." | 124 | This variable is relevant only if `backup-by-copying' is nil." |
| 125 | :type 'boolean | 125 | :type 'boolean |
| 126 | :group 'backup) | 126 | :group 'backup) |
| 127 | (put 'backup-by-copying-when-mismatch 'permanent-local t) | ||
| 127 | 128 | ||
| 128 | (defcustom backup-by-copying-when-privileged-mismatch 200 | 129 | (defcustom backup-by-copying-when-privileged-mismatch 200 |
| 129 | "Non-nil means create backups by copying to preserve a privileged owner. | 130 | "Non-nil means create backups by copying to preserve a privileged owner. |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index a3609c0ccfc..2b193fbe42a 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -2033,10 +2033,11 @@ See `set-language-info-alist' for use in programs." | |||
| 2033 | "Do various unibyte-mode setups for language environment LANGUAGE-NAME." | 2033 | "Do various unibyte-mode setups for language environment LANGUAGE-NAME." |
| 2034 | (set-display-table-and-terminal-coding-system language-name)) | 2034 | (set-display-table-and-terminal-coding-system language-name)) |
| 2035 | 2035 | ||
| 2036 | (defsubst princ-list (&rest args) | 2036 | (defun princ-list (&rest args) |
| 2037 | "Print all arguments with `princ', then print \"\\n\"." | 2037 | "Print all arguments with `princ', then print \"\\n\"." |
| 2038 | (while args (princ (car args)) (setq args (cdr args))) | 2038 | (while args (princ (car args)) (setq args (cdr args))) |
| 2039 | (princ "\n")) | 2039 | (princ "\n")) |
| 2040 | (make-obsolete 'princ-list "use mapc and princ instead" "23.3") | ||
| 2040 | 2041 | ||
| 2041 | (put 'describe-specified-language-support 'apropos-inhibit t) | 2042 | (put 'describe-specified-language-support 'apropos-inhibit t) |
| 2042 | 2043 | ||
diff --git a/lisp/locate.el b/lisp/locate.el index f1983a3e18a..f58b95710e2 100644 --- a/lisp/locate.el +++ b/lisp/locate.el | |||
| @@ -270,7 +270,7 @@ that is, with a prefix arg, you get the default behavior." | |||
| 270 | (defun locate (search-string &optional filter arg) | 270 | (defun locate (search-string &optional filter arg) |
| 271 | "Run the program `locate', putting results in `*Locate*' buffer. | 271 | "Run the program `locate', putting results in `*Locate*' buffer. |
| 272 | Pass it SEARCH-STRING as argument. Interactively, prompt for SEARCH-STRING. | 272 | Pass it SEARCH-STRING as argument. Interactively, prompt for SEARCH-STRING. |
| 273 | With prefix arg, prompt for the exact shell command to run instead. | 273 | With prefix arg ARG, prompt for the exact shell command to run instead. |
| 274 | 274 | ||
| 275 | This program searches for those file names in a database that match | 275 | This program searches for those file names in a database that match |
| 276 | SEARCH-STRING and normally outputs all matching absolute file names, | 276 | SEARCH-STRING and normally outputs all matching absolute file names, |
| @@ -286,7 +286,8 @@ the variables `locate-command' or `locate-make-command-line'. | |||
| 286 | The main use of FILTER is to implement `locate-with-filter'. See | 286 | The main use of FILTER is to implement `locate-with-filter'. See |
| 287 | the docstring of that function for its meaning. | 287 | the docstring of that function for its meaning. |
| 288 | 288 | ||
| 289 | ARG is the interactive prefix arg." | 289 | After preparing the results buffer, this runs `dired-mode-hook' and |
| 290 | then `locate-post-command-hook'." | ||
| 290 | (interactive | 291 | (interactive |
| 291 | (list | 292 | (list |
| 292 | (locate-prompt-for-search-string) | 293 | (locate-prompt-for-search-string) |
| @@ -300,8 +301,7 @@ ARG is the interactive prefix arg." | |||
| 300 | (locate-cmd-args (cdr locate-cmd-list)) | 301 | (locate-cmd-args (cdr locate-cmd-list)) |
| 301 | (run-locate-command | 302 | (run-locate-command |
| 302 | (or (and arg (not locate-prompt-for-command)) | 303 | (or (and arg (not locate-prompt-for-command)) |
| 303 | (and (not arg) locate-prompt-for-command))) | 304 | (and (not arg) locate-prompt-for-command)))) |
| 304 | ) | ||
| 305 | 305 | ||
| 306 | ;; Find the Locate buffer | 306 | ;; Find the Locate buffer |
| 307 | (save-window-excursion | 307 | (save-window-excursion |
| @@ -323,16 +323,13 @@ ARG is the interactive prefix arg." | |||
| 323 | (and filter | 323 | (and filter |
| 324 | (locate-filter-output filter)) | 324 | (locate-filter-output filter)) |
| 325 | 325 | ||
| 326 | (locate-do-setup search-string) | 326 | (locate-do-setup search-string))) |
| 327 | )) | ||
| 328 | (and (not (string-equal (buffer-name) locate-buffer-name)) | 327 | (and (not (string-equal (buffer-name) locate-buffer-name)) |
| 329 | (pop-to-buffer locate-buffer-name)) | 328 | (pop-to-buffer locate-buffer-name)) |
| 330 | 329 | ||
| 331 | (run-hooks 'dired-mode-hook) | 330 | (run-hooks 'dired-mode-hook) |
| 332 | (dired-next-line 3) ;move to first matching file. | 331 | (dired-next-line 3) ;move to first matching file. |
| 333 | (run-hooks 'locate-post-command-hook) | 332 | (run-hooks 'locate-post-command-hook))) |
| 334 | ) | ||
| 335 | ) | ||
| 336 | 333 | ||
| 337 | ;;;###autoload | 334 | ;;;###autoload |
| 338 | (defun locate-with-filter (search-string filter &optional arg) | 335 | (defun locate-with-filter (search-string filter &optional arg) |
| @@ -447,6 +444,7 @@ file name or is inside a subdirectory." | |||
| 447 | \\<locate-mode-map>\ | 444 | \\<locate-mode-map>\ |
| 448 | In that buffer, you can use almost all the usual dired bindings. | 445 | In that buffer, you can use almost all the usual dired bindings. |
| 449 | \\[locate-find-directory] visits the directory of the file on the current line. | 446 | \\[locate-find-directory] visits the directory of the file on the current line. |
| 447 | This function runs `locate-mode-hook' before returning. | ||
| 450 | 448 | ||
| 451 | Operating on listed files works, but does not always | 449 | Operating on listed files works, but does not always |
| 452 | automatically update the buffer as in ordinary Dired. | 450 | automatically update the buffer as in ordinary Dired. |
| @@ -687,5 +685,4 @@ the database on the command line." | |||
| 687 | 685 | ||
| 688 | (provide 'locate) | 686 | (provide 'locate) |
| 689 | 687 | ||
| 690 | ;; arch-tag: 60c4d098-b5d5-4b3c-a3e0-51a2e9f43898 | ||
| 691 | ;;; locate.el ends here | 688 | ;;; locate.el ends here |
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index f19143228c5..15299bc304e 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el | |||
| @@ -220,7 +220,8 @@ The Lisp emulation does not run any external programs or shells. It | |||
| 220 | supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards' | 220 | supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards' |
| 221 | is non-nil; otherwise, it interprets wildcards as regular expressions | 221 | is non-nil; otherwise, it interprets wildcards as regular expressions |
| 222 | to match file names. It does not support all `ls' switches -- those | 222 | to match file names. It does not support all `ls' switches -- those |
| 223 | that work are: A a c i r S s t u U X g G B C R n and F partly." | 223 | that work are: A a B C c F G g h i n R r S s t U u X. The l switch |
| 224 | is assumed to be always present and cannot be turned off." | ||
| 224 | (if ls-lisp-use-insert-directory-program | 225 | (if ls-lisp-use-insert-directory-program |
| 225 | (funcall original-insert-directory | 226 | (funcall original-insert-directory |
| 226 | file switches wildcard full-directory-p) | 227 | file switches wildcard full-directory-p) |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 2612dfd672c..0275dc1923b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | ;; provide the start info but not the end info in | 42 | ;; provide the start info but not the end info in |
| 43 | ;; completion-base-position. | 43 | ;; completion-base-position. |
| 44 | ;; - quoting is problematic. E.g. the double-dollar quoting used in | 44 | ;; - quoting is problematic. E.g. the double-dollar quoting used in |
| 45 | ;; substitie-in-file-name (and hence read-file-name-internal) bumps | 45 | ;; substitute-in-file-name (and hence read-file-name-internal) bumps |
| 46 | ;; into various bugs: | 46 | ;; into various bugs: |
| 47 | ;; - choose-completion doesn't know how to quote the text it inserts. | 47 | ;; - choose-completion doesn't know how to quote the text it inserts. |
| 48 | ;; E.g. it fails to double the dollars in file-name completion, or | 48 | ;; E.g. it fails to double the dollars in file-name completion, or |
| @@ -1133,6 +1133,7 @@ variables.") | |||
| 1133 | (interactive) | 1133 | (interactive) |
| 1134 | (message "Making completion list...") | 1134 | (message "Making completion list...") |
| 1135 | (lexical-let* ((start (field-beginning)) | 1135 | (lexical-let* ((start (field-beginning)) |
| 1136 | (end (field-end)) | ||
| 1136 | (string (field-string)) | 1137 | (string (field-string)) |
| 1137 | (completions (completion-all-completions | 1138 | (completions (completion-all-completions |
| 1138 | string | 1139 | string |
| @@ -1164,10 +1165,12 @@ variables.") | |||
| 1164 | completions))) | 1165 | completions))) |
| 1165 | (with-current-buffer standard-output | 1166 | (with-current-buffer standard-output |
| 1166 | (set (make-local-variable 'completion-base-position) | 1167 | (set (make-local-variable 'completion-base-position) |
| 1167 | ;; FIXME: We should provide the END part as well, but | 1168 | (list (+ start base-size) |
| 1168 | ;; currently completion-all-completions does not give | 1169 | ;; FIXME: We should pay attention to completion |
| 1169 | ;; us the necessary information. | 1170 | ;; boundaries here, but currently |
| 1170 | (list (+ start base-size) nil))) | 1171 | ;; completion-all-completions does not give us the |
| 1172 | ;; necessary information. | ||
| 1173 | end))) | ||
| 1171 | (display-completion-list completions))) | 1174 | (display-completion-list completions))) |
| 1172 | 1175 | ||
| 1173 | ;; If there are no completions, or if the current input is already the | 1176 | ;; If there are no completions, or if the current input is already the |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1ca46d213d3..e5ebe81ce29 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2864,8 +2864,7 @@ User is always nil." | |||
| 2864 | (set-buffer-modified-p nil) | 2864 | (set-buffer-modified-p nil) |
| 2865 | ;; For root, preserve owner and group when editing files. | 2865 | ;; For root, preserve owner and group when editing files. |
| 2866 | (when (string-equal (file-remote-p filename 'user) "root") | 2866 | (when (string-equal (file-remote-p filename 'user) "root") |
| 2867 | (set (make-local-variable 'backup-by-copying-when-mismatch) t) | 2867 | (set (make-local-variable 'backup-by-copying-when-mismatch) t))) |
| 2868 | (put 'backup-by-copying-when-mismatch 'permanent-local t))) | ||
| 2869 | (when (and (stringp local-copy) | 2868 | (when (and (stringp local-copy) |
| 2870 | (or remote-copy (null tramp-temp-buffer-file-name))) | 2869 | (or remote-copy (null tramp-temp-buffer-file-name))) |
| 2871 | (delete-file local-copy)) | 2870 | (delete-file local-copy)) |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e72b18afd61..d2bb82e0580 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -171,21 +171,9 @@ | |||
| 171 | ;; string delimiters. Fixme: Is there a better way? | 171 | ;; string delimiters. Fixme: Is there a better way? |
| 172 | ;; First avoid a sequence preceded by an odd number of backslashes. | 172 | ;; First avoid a sequence preceded by an odd number of backslashes. |
| 173 | (syntax-propertize-rules | 173 | (syntax-propertize-rules |
| 174 | (;; (rx (not (any ?\\)) | 174 | (;; ¡Backrefs don't work in syntax-propertize-rules! |
| 175 | ;; ?\\ (* (and ?\\ ?\\)) | 175 | (concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix. |
| 176 | ;; (group (syntax string-quote)) | 176 | "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)") |
| 177 | ;; (backref 1) | ||
| 178 | ;; (group (backref 1))) | ||
| 179 | ;; ¡Backrefs don't work in syntax-propertize-rules! | ||
| 180 | "[^\\]\\\\\\(\\\\\\\\\\)*\\(?:''\\('\\)\\|\"\"\\(?2:\"\\)\\)" | ||
| 181 | (2 "\"")) ; dummy | ||
| 182 | (;; (rx (optional (group (any "uUrR"))) ; prefix gets syntax property | ||
| 183 | ;; (optional (any "rR")) ; possible second prefix | ||
| 184 | ;; (group (syntax string-quote)) ; maybe gets property | ||
| 185 | ;; (backref 2) ; per first quote | ||
| 186 | ;; (group (backref 2))) ; maybe gets property | ||
| 187 | ;; ¡Backrefs don't work in syntax-propertize-rules! | ||
| 188 | "\\([RUru]\\)?[Rr]?\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)" | ||
| 189 | (3 (ignore (python-quote-syntax)))) | 177 | (3 (ignore (python-quote-syntax)))) |
| 190 | ;; This doesn't really help. | 178 | ;; This doesn't really help. |
| 191 | ;;((rx (and ?\\ (group ?\n))) (1 " ")) | 179 | ;;((rx (and ?\\ (group ?\n))) (1 " ")) |
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index 10fe0e7885e..620d236078b 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el | |||
| @@ -607,15 +607,11 @@ Commands: | |||
| 607 | (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") | 607 | (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") |
| 608 | (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") | 608 | (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") |
| 609 | 609 | ||
| 610 | ;; This can only be set to t in Emacs 19 and XEmacs. | ||
| 611 | ;; Emacs 18 and Epoch lose. | ||
| 612 | (set (make-local-variable 'parse-sexp-ignore-comments) t) | 610 | (set (make-local-variable 'parse-sexp-ignore-comments) t) |
| 613 | ;; XEmacs has defun-prompt-regexp, but I don't believe | 611 | ;; XEmacs has defun-prompt-regexp, but I don't believe |
| 614 | ;; that it works for end-of-defun -- only for | 612 | ;; that it works for end-of-defun -- only for |
| 615 | ;; beginning-of-defun. | 613 | ;; beginning-of-defun. |
| 616 | (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) | 614 | (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) |
| 617 | ;; The following doesn't work in Lucid Emacs 19.6, but maybe | ||
| 618 | ;; it will appear in later versions. | ||
| 619 | (set (make-local-variable 'add-log-current-defun-function) | 615 | (set (make-local-variable 'add-log-current-defun-function) |
| 620 | 'tcl-add-log-defun) | 616 | 'tcl-add-log-defun) |
| 621 | 617 | ||
| @@ -1201,11 +1197,7 @@ semicolon, opening brace, or opening bracket on the same line." | |||
| 1201 | "Determine if point is in a comment. | 1197 | "Determine if point is in a comment. |
| 1202 | Returns a list of the form `(FLAG . STATE)'. STATE can be used | 1198 | Returns a list of the form `(FLAG . STATE)'. STATE can be used |
| 1203 | as input to future invocations. FLAG is nil if not in comment, | 1199 | as input to future invocations. FLAG is nil if not in comment, |
| 1204 | t otherwise. If in comment, leaves point at beginning of comment. | 1200 | t otherwise. If in comment, leaves point at beginning of comment." |
| 1205 | |||
| 1206 | This function does not work in Emacs 18. | ||
| 1207 | See also `tcl-simple-scan-for-comment', a | ||
| 1208 | simpler version that is often right, and works in Emacs 18." | ||
| 1209 | (let ((bol (save-excursion | 1201 | (let ((bol (save-excursion |
| 1210 | (goto-char end) | 1202 | (goto-char end) |
| 1211 | (line-beginning-position))) | 1203 | (line-beginning-position))) |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 2bd4021a85f..42527ff60eb 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -124,9 +124,9 @@ | |||
| 124 | ;;; Code: | 124 | ;;; Code: |
| 125 | 125 | ||
| 126 | ;; This variable will always hold the version number of the mode | 126 | ;; This variable will always hold the version number of the mode |
| 127 | (defconst verilog-mode-version "647" | 127 | (defconst verilog-mode-version "650" |
| 128 | "Version of this Verilog mode.") | 128 | "Version of this Verilog mode.") |
| 129 | (defconst verilog-mode-release-date "2010-10-20-GNU" | 129 | (defconst verilog-mode-release-date "2010-11-05-GNU" |
| 130 | "Release date of this Verilog mode.") | 130 | "Release date of this Verilog mode.") |
| 131 | (defconst verilog-mode-release-emacs t | 131 | (defconst verilog-mode-release-emacs t |
| 132 | "If non-nil, this version of Verilog mode was released with Emacs itself.") | 132 | "If non-nil, this version of Verilog mode was released with Emacs itself.") |
| @@ -4551,16 +4551,18 @@ FILENAME or defaults to `buffer-file-name`." | |||
| 4551 | default nil nil | 4551 | default nil nil |
| 4552 | 'verilog-preprocess-history default))))) | 4552 | 'verilog-preprocess-history default))))) |
| 4553 | (unless command (setq command (verilog-expand-command verilog-preprocessor))) | 4553 | (unless command (setq command (verilog-expand-command verilog-preprocessor))) |
| 4554 | (let* ((dir (file-name-directory (or filename buffer-file-name))) | 4554 | (let* ((fontlocked (and (boundp 'font-lock-mode) font-lock-mode)) |
| 4555 | (dir (file-name-directory (or filename buffer-file-name))) | ||
| 4555 | (file (file-name-nondirectory (or filename buffer-file-name))) | 4556 | (file (file-name-nondirectory (or filename buffer-file-name))) |
| 4556 | (cmd (concat "cd " dir "; " command " " file))) | 4557 | (cmd (concat "cd " dir "; " command " " file))) |
| 4557 | (with-output-to-temp-buffer "*Verilog-Preprocessed*" | 4558 | (with-output-to-temp-buffer "*Verilog-Preprocessed*" |
| 4558 | (save-excursion | 4559 | (with-current-buffer (get-buffer "*Verilog-Preprocessed*") |
| 4559 | (set-buffer "*Verilog-Preprocessed*") | ||
| 4560 | (insert (concat "// " cmd "\n")) | 4560 | (insert (concat "// " cmd "\n")) |
| 4561 | (shell-command cmd "*Verilog-Preprocessed*") | 4561 | (shell-command cmd "*Verilog-Preprocessed*") |
| 4562 | (verilog-mode) | 4562 | (verilog-mode) |
| 4563 | (font-lock-mode))))) | 4563 | ;; Without this force, it takes a few idle seconds |
| 4564 | ;; to get the color, which is very jarring | ||
| 4565 | (when fontlocked (font-lock-fontify-buffer)))))) | ||
| 4564 | 4566 | ||
| 4565 | 4567 | ||
| 4566 | ;; | 4568 | ;; |
| @@ -7266,7 +7268,10 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7266 | ((looking-at "\\s-*\\(\\[[^]]+\\]\\)") | 7268 | ((looking-at "\\s-*\\(\\[[^]]+\\]\\)") |
| 7267 | (goto-char (match-end 0)) | 7269 | (goto-char (match-end 0)) |
| 7268 | (cond (newsig ; Memory, not just width. Patch last signal added's memory (nth 3) | 7270 | (cond (newsig ; Memory, not just width. Patch last signal added's memory (nth 3) |
| 7269 | (setcar (cdr (cdr (cdr newsig))) (match-string 1))) | 7271 | (setcar (cdr (cdr (cdr newsig))) |
| 7272 | (if (verilog-sig-memory newsig) | ||
| 7273 | (concat (verilog-sig-memory newsig) (match-string 1)) | ||
| 7274 | (match-string 1)))) | ||
| 7270 | (vec ;; Multidimensional | 7275 | (vec ;; Multidimensional |
| 7271 | (setq multidim (cons vec multidim)) | 7276 | (setq multidim (cons vec multidim)) |
| 7272 | (setq vec (verilog-string-replace-matches | 7277 | (setq vec (verilog-string-replace-matches |
| @@ -7404,7 +7409,9 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7404 | (cons (verilog-sig-new | 7409 | (cons (verilog-sig-new |
| 7405 | sig | 7410 | sig |
| 7406 | (if dotname (verilog-sig-bits portdata) vec) | 7411 | (if dotname (verilog-sig-bits portdata) vec) |
| 7407 | (concat "To/From " comment) nil nil | 7412 | (concat "To/From " comment) |
| 7413 | (verilog-sig-memory portdata) | ||
| 7414 | nil | ||
| 7408 | (verilog-sig-signed portdata) | 7415 | (verilog-sig-signed portdata) |
| 7409 | (verilog-sig-type portdata) | 7416 | (verilog-sig-type portdata) |
| 7410 | multidim nil) | 7417 | multidim nil) |
| @@ -7415,7 +7422,9 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7415 | (cons (verilog-sig-new | 7422 | (cons (verilog-sig-new |
| 7416 | sig | 7423 | sig |
| 7417 | (if dotname (verilog-sig-bits portdata) vec) | 7424 | (if dotname (verilog-sig-bits portdata) vec) |
| 7418 | (concat "From " comment) nil nil | 7425 | (concat "From " comment) |
| 7426 | (verilog-sig-memory portdata) | ||
| 7427 | nil | ||
| 7419 | (verilog-sig-signed portdata) | 7428 | (verilog-sig-signed portdata) |
| 7420 | (verilog-sig-type portdata) | 7429 | (verilog-sig-type portdata) |
| 7421 | multidim nil) | 7430 | multidim nil) |
| @@ -7426,7 +7435,9 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7426 | (cons (verilog-sig-new | 7435 | (cons (verilog-sig-new |
| 7427 | sig | 7436 | sig |
| 7428 | (if dotname (verilog-sig-bits portdata) vec) | 7437 | (if dotname (verilog-sig-bits portdata) vec) |
| 7429 | (concat "To " comment) nil nil | 7438 | (concat "To " comment) |
| 7439 | (verilog-sig-memory portdata) | ||
| 7440 | nil | ||
| 7430 | (verilog-sig-signed portdata) | 7441 | (verilog-sig-signed portdata) |
| 7431 | (verilog-sig-type portdata) | 7442 | (verilog-sig-type portdata) |
| 7432 | multidim nil) | 7443 | multidim nil) |
| @@ -7436,7 +7447,9 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7436 | (cons (verilog-sig-new | 7447 | (cons (verilog-sig-new |
| 7437 | sig | 7448 | sig |
| 7438 | (if dotname (verilog-sig-bits portdata) vec) | 7449 | (if dotname (verilog-sig-bits portdata) vec) |
| 7439 | (concat "To/From " comment) nil nil | 7450 | (concat "To/From " comment) |
| 7451 | (verilog-sig-memory portdata) | ||
| 7452 | nil | ||
| 7440 | (verilog-sig-signed portdata) | 7453 | (verilog-sig-signed portdata) |
| 7441 | (verilog-sig-type portdata) | 7454 | (verilog-sig-type portdata) |
| 7442 | multidim nil) | 7455 | multidim nil) |
| @@ -7448,7 +7461,9 @@ Return a array of [outputs inouts inputs wire reg assign const]." | |||
| 7448 | (cons (verilog-sig-new | 7461 | (cons (verilog-sig-new |
| 7449 | sig | 7462 | sig |
| 7450 | (if dotname (verilog-sig-bits portdata) vec) | 7463 | (if dotname (verilog-sig-bits portdata) vec) |
| 7451 | (concat "To/From " comment) nil nil | 7464 | (concat "To/From " comment) |
| 7465 | (verilog-sig-memory portdata) | ||
| 7466 | nil | ||
| 7452 | (verilog-sig-signed portdata) | 7467 | (verilog-sig-signed portdata) |
| 7453 | (verilog-sig-type portdata) | 7468 | (verilog-sig-type portdata) |
| 7454 | multidim nil) | 7469 | multidim nil) |
| @@ -8862,7 +8877,9 @@ with appropriate INDENT-PT indentation." | |||
| 8862 | (indent-to (max 24 (+ indent-pt 16))) | 8877 | (indent-to (max 24 (+ indent-pt 16))) |
| 8863 | (unless (= (char-syntax (preceding-char)) ?\ ) | 8878 | (unless (= (char-syntax (preceding-char)) ?\ ) |
| 8864 | (insert " ")) ; Need space between "]name" if indent-to did nothing | 8879 | (insert " ")) ; Need space between "]name" if indent-to did nothing |
| 8865 | (insert (verilog-sig-name sig))) | 8880 | (insert (verilog-sig-name sig)) |
| 8881 | (when (verilog-sig-memory sig) | ||
| 8882 | (insert " " (verilog-sig-memory sig)))) | ||
| 8866 | 8883 | ||
| 8867 | (defun verilog-insert-definition (sigs direction indent-pt v2k &optional dont-sort) | 8884 | (defun verilog-insert-definition (sigs direction indent-pt v2k &optional dont-sort) |
| 8868 | "Print out a definition for a list of SIGS of the given DIRECTION, | 8885 | "Print out a definition for a list of SIGS of the given DIRECTION, |
diff --git a/lisp/server.el b/lisp/server.el index 6fbef70768d..ecc9b16cce7 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -498,7 +498,7 @@ See variable `server-auth-dir' for details." | |||
| 498 | (error "The directory `%s' is unsafe" dir))))) | 498 | (error "The directory `%s' is unsafe" dir))))) |
| 499 | 499 | ||
| 500 | ;;;###autoload | 500 | ;;;###autoload |
| 501 | (defun server-start (&optional leave-dead) | 501 | (defun server-start (&optional leave-dead inhibit-prompt) |
| 502 | "Allow this Emacs process to be a server for client processes. | 502 | "Allow this Emacs process to be a server for client processes. |
| 503 | This starts a server communications subprocess through which | 503 | This starts a server communications subprocess through which |
| 504 | client \"editors\" can send your editing commands to this Emacs | 504 | client \"editors\" can send your editing commands to this Emacs |
| @@ -508,7 +508,10 @@ Emacs distribution as your standard \"editor\". | |||
| 508 | Optional argument LEAVE-DEAD (interactively, a prefix arg) means just | 508 | Optional argument LEAVE-DEAD (interactively, a prefix arg) means just |
| 509 | kill any existing server communications subprocess. | 509 | kill any existing server communications subprocess. |
| 510 | 510 | ||
| 511 | If a server is already running, the server is not started. | 511 | If a server is already running, restart it. If clients are |
| 512 | running, ask the user for confirmation first, unless optional | ||
| 513 | argument INHIBIT-PROMPT is non-nil. | ||
| 514 | |||
| 512 | To force-start a server, do \\[server-force-delete] and then | 515 | To force-start a server, do \\[server-force-delete] and then |
| 513 | \\[server-start]." | 516 | \\[server-start]." |
| 514 | (interactive "P") | 517 | (interactive "P") |
| @@ -516,12 +519,14 @@ To force-start a server, do \\[server-force-delete] and then | |||
| 516 | ;; Ask the user before deleting existing clients---except | 519 | ;; Ask the user before deleting existing clients---except |
| 517 | ;; when we can't get user input, which may happen when | 520 | ;; when we can't get user input, which may happen when |
| 518 | ;; doing emacsclient --eval "(kill-emacs)" in daemon mode. | 521 | ;; doing emacsclient --eval "(kill-emacs)" in daemon mode. |
| 519 | (if (and (daemonp) | 522 | (cond |
| 520 | (null (cdr (frame-list))) | 523 | ((and (daemonp) |
| 521 | (eq (selected-frame) terminal-frame)) | 524 | (null (cdr (frame-list))) |
| 522 | leave-dead | 525 | (eq (selected-frame) terminal-frame)) |
| 523 | (yes-or-no-p | 526 | leave-dead) |
| 524 | "The current server still has clients; delete them? "))) | 527 | (inhibit-prompt t) |
| 528 | (t (yes-or-no-p | ||
| 529 | "The current server still has clients; delete them? ")))) | ||
| 525 | (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) | 530 | (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) |
| 526 | (server-file (expand-file-name server-name server-dir))) | 531 | (server-file (expand-file-name server-name server-dir))) |
| 527 | (when server-process | 532 | (when server-process |
| @@ -560,7 +565,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") | |||
| 560 | (add-hook 'delete-frame-functions 'server-handle-delete-frame) | 565 | (add-hook 'delete-frame-functions 'server-handle-delete-frame) |
| 561 | (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) | 566 | (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) |
| 562 | (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) | 567 | (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) |
| 563 | (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit. | 568 | (add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit. |
| 564 | (setq server-process | 569 | (setq server-process |
| 565 | (apply #'make-network-process | 570 | (apply #'make-network-process |
| 566 | :name server-name | 571 | :name server-name |
| @@ -601,6 +606,11 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") | |||
| 601 | " " (number-to-string (emacs-pid)) ; Kept for compatibility | 606 | " " (number-to-string (emacs-pid)) ; Kept for compatibility |
| 602 | "\n" auth-key))))))))) | 607 | "\n" auth-key))))))))) |
| 603 | 608 | ||
| 609 | (defun server-force-stop () | ||
| 610 | "Kill all connections to the current server. | ||
| 611 | This function is meant to be called from `kill-emacs-hook'." | ||
| 612 | (server-start nil t)) | ||
| 613 | |||
| 604 | ;;;###autoload | 614 | ;;;###autoload |
| 605 | (defun server-force-delete (&optional name) | 615 | (defun server-force-delete (&optional name) |
| 606 | "Unconditionally delete connection file for server NAME. | 616 | "Unconditionally delete connection file for server NAME. |
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 3d76d34f3d8..a1ca6ab4d65 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el | |||
| @@ -110,7 +110,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 110 | (defun vc-mtn-after-dir-status (update-function) | 110 | (defun vc-mtn-after-dir-status (update-function) |
| 111 | (let (result) | 111 | (let (result) |
| 112 | (goto-char (point-min)) | 112 | (goto-char (point-min)) |
| 113 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t) | 113 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t) |
| 114 | (while (re-search-forward | 114 | (while (re-search-forward |
| 115 | "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t) | 115 | "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t) |
| 116 | (cond ((match-end 1) (push (list (match-string 3) 'edited) result)) | 116 | (cond ((match-end 1) (push (list (match-string 3) 'edited) result)) |
| @@ -129,7 +129,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 129 | (with-temp-buffer | 129 | (with-temp-buffer |
| 130 | (vc-mtn-command t 0 file "status") | 130 | (vc-mtn-command t 0 file "status") |
| 131 | (goto-char (point-min)) | 131 | (goto-char (point-min)) |
| 132 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") | 132 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)") |
| 133 | (match-string 2)))) | 133 | (match-string 2)))) |
| 134 | 134 | ||
| 135 | (defun vc-mtn-workfile-branch (file) | 135 | (defun vc-mtn-workfile-branch (file) |
| @@ -139,7 +139,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 139 | (with-temp-buffer | 139 | (with-temp-buffer |
| 140 | (vc-mtn-command t 0 file "status") | 140 | (vc-mtn-command t 0 file "status") |
| 141 | (goto-char (point-min)) | 141 | (goto-char (point-min)) |
| 142 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") | 142 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)") |
| 143 | (match-string 1)))) | 143 | (match-string 1)))) |
| 144 | 144 | ||
| 145 | (defun vc-mtn-workfile-unchanged-p (file) | 145 | (defun vc-mtn-workfile-unchanged-p (file) |
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index f05553a38b3..329a4ac9565 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-11-09 Elias Pipping <pipping.elias@googlemail.com> (tiny change) | ||
| 2 | |||
| 3 | Make Emacs compile with clang (bug#7309). | ||
| 4 | * XMakeAssoc.c (XMakeAssoc): | ||
| 5 | * XDelAssoc.c (XDeleteAssoc): Declare the return type. | ||
| 6 | |||
| 1 | 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 8 | ||
| 3 | * XMenu.h: Include <stdlib.h>. | 9 | * XMenu.h: Include <stdlib.h>. |
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c index 7aca50aa56b..43446ae8a25 100644 --- a/oldXMenu/XDelAssoc.c +++ b/oldXMenu/XDelAssoc.c | |||
| @@ -17,6 +17,7 @@ void emacs_remque(struct qelem*); | |||
| 17 | * an XId. An association may be removed only once. Redundant | 17 | * an XId. An association may be removed only once. Redundant |
| 18 | * deletes are meaningless (but cause no problems). | 18 | * deletes are meaningless (but cause no problems). |
| 19 | */ | 19 | */ |
| 20 | void | ||
| 20 | XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id) | 21 | XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id) |
| 21 | { | 22 | { |
| 22 | int hash; | 23 | int hash; |
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c index 84157399b43..3c79d17dc6a 100644 --- a/oldXMenu/XMakeAssoc.c +++ b/oldXMenu/XMakeAssoc.c | |||
| @@ -26,6 +26,7 @@ void emacs_insque (struct qelem *elem, struct qelem *prev); | |||
| 26 | * meaningless (but cause no problems). The queue in each association | 26 | * meaningless (but cause no problems). The queue in each association |
| 27 | * bucket is sorted (lowest XId to highest XId). | 27 | * bucket is sorted (lowest XId to highest XId). |
| 28 | */ | 28 | */ |
| 29 | void | ||
| 29 | XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) | 30 | XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) |
| 30 | { | 31 | { |
| 31 | int hash; | 32 | int hash; |
diff --git a/src/ChangeLog b/src/ChangeLog index 5a0d859ac27..985a07c4ea3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,26 @@ | |||
| 1 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xfns.c (x_real_positions): Fix declaration-after-statement | ||
| 4 | problem. | ||
| 5 | |||
| 6 | 2010-11-09 Chong Yidong <cyd@stupidchicken.com> | ||
| 7 | |||
| 8 | * image.c (free_image): Don't garbage the frame here, since this | ||
| 9 | function can be called while redisplaying (Bug#7210). | ||
| 10 | (uncache_image): Garbage the frame here (Bug#6426). | ||
| 11 | |||
| 12 | 2010-11-09 Jan Djärv <jan.h.d@swipnet.se> | ||
| 13 | |||
| 14 | * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our | ||
| 15 | parent is the root window. Check this after traversing window tree. | ||
| 16 | |||
| 17 | * xterm.c (x_term_init): Initialize Xatom_net_frame_extents. | ||
| 18 | |||
| 19 | * xterm.h (struct x_display_info): Xatom_net_frame_extents is new. | ||
| 20 | |||
| 21 | * xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first | ||
| 22 | before traversing window tree (Bug#5721). | ||
| 23 | |||
| 1 | 2010-11-07 Jan Djärv <jan.h.d@swipnet.se> | 24 | 2010-11-07 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 25 | ||
| 3 | * xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE. | 26 | * xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE. |
diff --git a/src/config.in b/src/config.in index 5b042ce8eff..1846bfb9e7b 100644 --- a/src/config.in +++ b/src/config.in | |||
| @@ -1059,9 +1059,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1059 | /* Define to `int' if <sys/types.h> does not define. */ | 1059 | /* Define to `int' if <sys/types.h> does not define. */ |
| 1060 | #undef pid_t | 1060 | #undef pid_t |
| 1061 | 1061 | ||
| 1062 | /* Define to `unsigned int' if <sys/types.h> does not define. */ | ||
| 1063 | #undef size_t | ||
| 1064 | |||
| 1065 | /* Define to any substitute for sys_siglist. */ | 1062 | /* Define to any substitute for sys_siglist. */ |
| 1066 | #undef sys_siglist | 1063 | #undef sys_siglist |
| 1067 | 1064 | ||
diff --git a/src/image.c b/src/image.c index 083d0720c15..828c2d319be 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1049,10 +1049,6 @@ free_image (struct frame *f, struct image *img) | |||
| 1049 | /* Free resources, then free IMG. */ | 1049 | /* Free resources, then free IMG. */ |
| 1050 | img->type->free (f, img); | 1050 | img->type->free (f, img); |
| 1051 | xfree (img); | 1051 | xfree (img); |
| 1052 | |||
| 1053 | /* As display glyphs may still be referring to the image ID, we | ||
| 1054 | must garbage the frame (Bug#6426). */ | ||
| 1055 | SET_FRAME_GARBAGED (f); | ||
| 1056 | } | 1052 | } |
| 1057 | } | 1053 | } |
| 1058 | 1054 | ||
| @@ -1471,7 +1467,12 @@ uncache_image (struct frame *f, Lisp_Object spec) | |||
| 1471 | { | 1467 | { |
| 1472 | struct image *img = search_image_cache (f, spec, sxhash (spec, 0)); | 1468 | struct image *img = search_image_cache (f, spec, sxhash (spec, 0)); |
| 1473 | if (img) | 1469 | if (img) |
| 1474 | free_image (f, img); | 1470 | { |
| 1471 | free_image (f, img); | ||
| 1472 | /* As display glyphs may still be referring to the image ID, we | ||
| 1473 | must garbage the frame (Bug#6426). */ | ||
| 1474 | SET_FRAME_GARBAGED (f); | ||
| 1475 | } | ||
| 1475 | } | 1476 | } |
| 1476 | 1477 | ||
| 1477 | 1478 | ||
diff --git a/src/xfns.c b/src/xfns.c index 576ab3f0ef1..28566eb9a64 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -519,12 +519,20 @@ x_real_positions (FRAME_PTR f, int *xptr, int *yptr) | |||
| 519 | int real_x = 0, real_y = 0; | 519 | int real_x = 0, real_y = 0; |
| 520 | int had_errors = 0; | 520 | int had_errors = 0; |
| 521 | Window win = f->output_data.x->parent_desc; | 521 | Window win = f->output_data.x->parent_desc; |
| 522 | Atom actual_type; | ||
| 523 | unsigned long actual_size, bytes_remaining; | ||
| 524 | int i, rc, actual_format; | ||
| 525 | struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | ||
| 526 | long max_len = 400; | ||
| 527 | Display *dpy = FRAME_X_DISPLAY (f); | ||
| 528 | unsigned char *tmp_data = NULL; | ||
| 529 | Atom target_type = XA_CARDINAL; | ||
| 522 | 530 | ||
| 523 | BLOCK_INPUT; | 531 | BLOCK_INPUT; |
| 524 | 532 | ||
| 525 | x_catch_errors (FRAME_X_DISPLAY (f)); | 533 | x_catch_errors (dpy); |
| 526 | 534 | ||
| 527 | if (win == FRAME_X_DISPLAY_INFO (f)->root_window) | 535 | if (win == dpyinfo->root_window) |
| 528 | win = FRAME_OUTER_WINDOW (f); | 536 | win = FRAME_OUTER_WINDOW (f); |
| 529 | 537 | ||
| 530 | /* This loop traverses up the containment tree until we hit the root | 538 | /* This loop traverses up the containment tree until we hit the root |
| @@ -609,6 +617,33 @@ x_real_positions (FRAME_PTR f, int *xptr, int *yptr) | |||
| 609 | had_errors = x_had_errors_p (FRAME_X_DISPLAY (f)); | 617 | had_errors = x_had_errors_p (FRAME_X_DISPLAY (f)); |
| 610 | } | 618 | } |
| 611 | 619 | ||
| 620 | |||
| 621 | if (dpyinfo->root_window == f->output_data.x->parent_desc) | ||
| 622 | { | ||
| 623 | /* Try _NET_FRAME_EXTENTS if our parent is the root window. */ | ||
| 624 | rc = XGetWindowProperty (dpy, win, dpyinfo->Xatom_net_frame_extents, | ||
| 625 | 0, max_len, False, target_type, | ||
| 626 | &actual_type, &actual_format, &actual_size, | ||
| 627 | &bytes_remaining, &tmp_data); | ||
| 628 | |||
| 629 | if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy) | ||
| 630 | && actual_size == 4 && actual_format == 32) | ||
| 631 | { | ||
| 632 | int ign; | ||
| 633 | Window rootw; | ||
| 634 | long *fe = (long *)tmp_data; | ||
| 635 | |||
| 636 | XGetGeometry (FRAME_X_DISPLAY (f), win, | ||
| 637 | &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); | ||
| 638 | outer_x = -fe[0]; | ||
| 639 | outer_y = -fe[2]; | ||
| 640 | real_x -= fe[0]; | ||
| 641 | real_y -= fe[2]; | ||
| 642 | } | ||
| 643 | } | ||
| 644 | |||
| 645 | if (tmp_data) XFree (tmp_data); | ||
| 646 | |||
| 612 | x_uncatch_errors (); | 647 | x_uncatch_errors (); |
| 613 | 648 | ||
| 614 | UNBLOCK_INPUT; | 649 | UNBLOCK_INPUT; |
diff --git a/src/xterm.c b/src/xterm.c index 7297ee71f0f..4c0493891e3 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10278,6 +10278,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10278 | = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False); | 10278 | = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False); |
| 10279 | dpyinfo->Xatom_net_wm_name | 10279 | dpyinfo->Xatom_net_wm_name |
| 10280 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); | 10280 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); |
| 10281 | dpyinfo->Xatom_net_frame_extents | ||
| 10282 | = XInternAtom (dpyinfo->display, "_NET_FRAME_EXTENTS", False); | ||
| 10281 | 10283 | ||
| 10282 | dpyinfo->x_dnd_atoms_size = 8; | 10284 | dpyinfo->x_dnd_atoms_size = 8; |
| 10283 | dpyinfo->x_dnd_atoms_length = 0; | 10285 | dpyinfo->x_dnd_atoms_length = 0; |
diff --git a/src/xterm.h b/src/xterm.h index ec99a659b8e..1d144b3b704 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -337,10 +337,10 @@ struct x_display_info | |||
| 337 | Window net_supported_window; | 337 | Window net_supported_window; |
| 338 | Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; | 338 | Atom Xatom_net_window_type, Xatom_net_window_type_tooltip; |
| 339 | 339 | ||
| 340 | /* Atoms dealing with maximization and fullscreen */ | 340 | /* Atoms dealing with EWMH (i.e. _NET_...) */ |
| 341 | Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, | 341 | Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom, |
| 342 | Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, | 342 | Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, |
| 343 | Xatom_net_wm_state_sticky; | 343 | Xatom_net_wm_state_sticky, Xatom_net_frame_extents; |
| 344 | 344 | ||
| 345 | /* XSettings atoms and windows. */ | 345 | /* XSettings atoms and windows. */ |
| 346 | Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; | 346 | Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; |