diff options
| author | Joakim Verona | 2010-04-02 23:09:13 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-04-02 23:09:13 +0200 |
| commit | 3de25479216a2ecec509df8933047873d084f708 (patch) | |
| tree | 55a93b61a20914cff6afe0c9f40d3bd0f8680ed7 | |
| parent | 796bb9364a5244a089769f4c92daab1835b618c7 (diff) | |
| download | emacs-3de25479216a2ecec509df8933047873d084f708.tar.gz emacs-3de25479216a2ecec509df8933047873d084f708.zip | |
imagemagick patch5 + minor mods
| -rwxr-xr-x | configure | 986 | ||||
| -rw-r--r-- | configure.in | 20 | ||||
| -rw-r--r-- | lisp/image.el | 25 | ||||
| -rw-r--r-- | src/Makefile.in | 10 | ||||
| -rw-r--r-- | src/image.c | 478 |
5 files changed, 1095 insertions, 424 deletions
| @@ -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.62 for emacs 24.0.50. | 3 | # Generated by GNU Autoconf 2.63 for emacs 24.0.50. |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 5 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| 6 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 6 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| @@ -638,150 +638,152 @@ ac_includes_default="\ | |||
| 638 | ac_config_libobj_dir=src | 638 | ac_config_libobj_dir=src |
| 639 | ac_header_list= | 639 | ac_header_list= |
| 640 | ac_func_list= | 640 | ac_func_list= |
| 641 | ac_subst_vars='SHELL | 641 | ac_subst_vars='LTLIBOBJS |
| 642 | PATH_SEPARATOR | ||
| 643 | PACKAGE_NAME | ||
| 644 | PACKAGE_TARNAME | ||
| 645 | PACKAGE_VERSION | ||
| 646 | PACKAGE_STRING | ||
| 647 | PACKAGE_BUGREPORT | ||
| 648 | exec_prefix | ||
| 649 | prefix | ||
| 650 | program_transform_name | ||
| 651 | bindir | ||
| 652 | sbindir | ||
| 653 | libexecdir | ||
| 654 | datarootdir | ||
| 655 | datadir | ||
| 656 | sysconfdir | ||
| 657 | sharedstatedir | ||
| 658 | localstatedir | ||
| 659 | includedir | ||
| 660 | oldincludedir | ||
| 661 | docdir | ||
| 662 | infodir | ||
| 663 | htmldir | ||
| 664 | dvidir | ||
| 665 | pdfdir | ||
| 666 | psdir | ||
| 667 | libdir | ||
| 668 | localedir | ||
| 669 | mandir | ||
| 670 | DEFS | ||
| 671 | ECHO_C | ||
| 672 | ECHO_N | ||
| 673 | ECHO_T | ||
| 674 | LIBS | ||
| 675 | build_alias | ||
| 676 | host_alias | ||
| 677 | target_alias | ||
| 678 | MAINT | ||
| 679 | build | ||
| 680 | build_cpu | ||
| 681 | build_vendor | ||
| 682 | build_os | ||
| 683 | host | ||
| 684 | host_cpu | ||
| 685 | host_vendor | ||
| 686 | host_os | ||
| 687 | CC | ||
| 688 | CFLAGS | ||
| 689 | LDFLAGS | ||
| 690 | CPPFLAGS | ||
| 691 | ac_ct_CC | ||
| 692 | EXEEXT | ||
| 693 | OBJEXT | ||
| 694 | CPP | ||
| 695 | GREP | ||
| 696 | EGREP | ||
| 697 | LN_S | ||
| 698 | INSTALL_PROGRAM | ||
| 699 | INSTALL_SCRIPT | ||
| 700 | INSTALL_DATA | ||
| 701 | RANLIB | ||
| 702 | INSTALL_INFO | ||
| 703 | GZIP_PROG | ||
| 704 | MAKEINFO | ||
| 705 | LIBSOUND | ||
| 706 | PKG_CONFIG | ||
| 707 | ALSA_CFLAGS | ||
| 708 | ALSA_LIBS | ||
| 709 | CFLAGS_SOUND | ||
| 710 | SET_MAKE | ||
| 711 | XMKMF | ||
| 712 | HAVE_XSERVER | ||
| 713 | RSVG_CFLAGS | ||
| 714 | RSVG_LIBS | ||
| 715 | GTK_CFLAGS | ||
| 716 | GTK_LIBS | ||
| 717 | DBUS_CFLAGS | ||
| 718 | DBUS_LIBS | ||
| 719 | GCONF_CFLAGS | ||
| 720 | GCONF_LIBS | ||
| 721 | FONTCONFIG_CFLAGS | ||
| 722 | FONTCONFIG_LIBS | ||
| 723 | XFT_CFLAGS | ||
| 724 | XFT_LIBS | ||
| 725 | LIBOTF_CFLAGS | ||
| 726 | LIBOTF_LIBS | ||
| 727 | M17N_FLT_CFLAGS | ||
| 728 | M17N_FLT_LIBS | ||
| 729 | FREETYPE_CFLAGS | ||
| 730 | FREETYPE_LIBS | ||
| 731 | LIBXPM | ||
| 732 | LIBJPEG | ||
| 733 | LIBPNG | ||
| 734 | LIBTIFF | ||
| 735 | LIBGIF | ||
| 736 | LIBGPM | ||
| 737 | ALLOCA | ||
| 738 | liblockfile | ||
| 739 | LIBS_MAIL | ||
| 740 | LIBOBJS | ||
| 741 | NEED_SETGID | ||
| 742 | KMEM_GROUP | ||
| 743 | GETLOADAVG_LIBS | ||
| 744 | GETOPT_H | ||
| 745 | GETOPTOBJS | ||
| 746 | LIBHESIOD | ||
| 747 | LIBRESOLV | ||
| 748 | COM_ERRLIB | ||
| 749 | CRYPTOLIB | ||
| 750 | KRB5LIB | ||
| 751 | DESLIB | ||
| 752 | KRB4LIB | ||
| 753 | version | ||
| 754 | configuration | ||
| 755 | canonical | ||
| 756 | srcdir | ||
| 757 | lispdir | ||
| 758 | locallisppath | ||
| 759 | lisppath | ||
| 760 | x_default_search_path | ||
| 761 | etcdir | ||
| 762 | archlibdir | ||
| 763 | bitmapdir | ||
| 764 | gamedir | ||
| 765 | gameuser | ||
| 766 | c_switch_system | ||
| 767 | c_switch_machine | ||
| 768 | LD_SWITCH_X_SITE | ||
| 769 | LD_SWITCH_X_SITE_AUX | ||
| 770 | C_SWITCH_X_SITE | ||
| 771 | X_TOOLKIT_TYPE | ||
| 772 | machfile | ||
| 773 | opsysfile | ||
| 774 | ns_appdir | ||
| 775 | ns_appbindir | ||
| 776 | ns_appresdir | ||
| 777 | ns_appsrc | ||
| 778 | GNUSTEP_MAKEFILES | ||
| 779 | GNUSTEP_SYSTEM_HEADERS | ||
| 780 | GNUSTEP_SYSTEM_LIBRARIES | ||
| 781 | GNU_OBJC_CFLAGS | ||
| 782 | LIB_SRC_EXTRA_INSTALLABLES | ||
| 783 | OTHER_FILES | 642 | OTHER_FILES |
| 784 | LTLIBOBJS' | 643 | LIB_SRC_EXTRA_INSTALLABLES |
| 644 | GNU_OBJC_CFLAGS | ||
| 645 | GNUSTEP_SYSTEM_LIBRARIES | ||
| 646 | GNUSTEP_SYSTEM_HEADERS | ||
| 647 | GNUSTEP_MAKEFILES | ||
| 648 | ns_appsrc | ||
| 649 | ns_appresdir | ||
| 650 | ns_appbindir | ||
| 651 | ns_appdir | ||
| 652 | opsysfile | ||
| 653 | machfile | ||
| 654 | X_TOOLKIT_TYPE | ||
| 655 | C_SWITCH_X_SITE | ||
| 656 | LD_SWITCH_X_SITE_AUX | ||
| 657 | LD_SWITCH_X_SITE | ||
| 658 | c_switch_machine | ||
| 659 | c_switch_system | ||
| 660 | gameuser | ||
| 661 | gamedir | ||
| 662 | bitmapdir | ||
| 663 | archlibdir | ||
| 664 | etcdir | ||
| 665 | x_default_search_path | ||
| 666 | lisppath | ||
| 667 | locallisppath | ||
| 668 | lispdir | ||
| 669 | srcdir | ||
| 670 | canonical | ||
| 671 | configuration | ||
| 672 | version | ||
| 673 | KRB4LIB | ||
| 674 | DESLIB | ||
| 675 | KRB5LIB | ||
| 676 | CRYPTOLIB | ||
| 677 | COM_ERRLIB | ||
| 678 | LIBRESOLV | ||
| 679 | LIBHESIOD | ||
| 680 | GETOPTOBJS | ||
| 681 | GETOPT_H | ||
| 682 | GETLOADAVG_LIBS | ||
| 683 | KMEM_GROUP | ||
| 684 | NEED_SETGID | ||
| 685 | LIBOBJS | ||
| 686 | LIBS_MAIL | ||
| 687 | liblockfile | ||
| 688 | ALLOCA | ||
| 689 | LIBGPM | ||
| 690 | LIBGIF | ||
| 691 | LIBTIFF | ||
| 692 | LIBPNG | ||
| 693 | LIBJPEG | ||
| 694 | LIBXPM | ||
| 695 | FREETYPE_LIBS | ||
| 696 | FREETYPE_CFLAGS | ||
| 697 | M17N_FLT_LIBS | ||
| 698 | M17N_FLT_CFLAGS | ||
| 699 | LIBOTF_LIBS | ||
| 700 | LIBOTF_CFLAGS | ||
| 701 | XFT_LIBS | ||
| 702 | XFT_CFLAGS | ||
| 703 | FONTCONFIG_LIBS | ||
| 704 | FONTCONFIG_CFLAGS | ||
| 705 | GCONF_LIBS | ||
| 706 | GCONF_CFLAGS | ||
| 707 | DBUS_LIBS | ||
| 708 | DBUS_CFLAGS | ||
| 709 | GTK_LIBS | ||
| 710 | GTK_CFLAGS | ||
| 711 | IMAGEMAGICK_LIBS | ||
| 712 | IMAGEMAGICK_CFLAGS | ||
| 713 | RSVG_LIBS | ||
| 714 | RSVG_CFLAGS | ||
| 715 | HAVE_XSERVER | ||
| 716 | XMKMF | ||
| 717 | SET_MAKE | ||
| 718 | CFLAGS_SOUND | ||
| 719 | ALSA_LIBS | ||
| 720 | ALSA_CFLAGS | ||
| 721 | PKG_CONFIG | ||
| 722 | LIBSOUND | ||
| 723 | MAKEINFO | ||
| 724 | GZIP_PROG | ||
| 725 | INSTALL_INFO | ||
| 726 | RANLIB | ||
| 727 | INSTALL_DATA | ||
| 728 | INSTALL_SCRIPT | ||
| 729 | INSTALL_PROGRAM | ||
| 730 | LN_S | ||
| 731 | EGREP | ||
| 732 | GREP | ||
| 733 | CPP | ||
| 734 | OBJEXT | ||
| 735 | EXEEXT | ||
| 736 | ac_ct_CC | ||
| 737 | CPPFLAGS | ||
| 738 | LDFLAGS | ||
| 739 | CFLAGS | ||
| 740 | CC | ||
| 741 | host_os | ||
| 742 | host_vendor | ||
| 743 | host_cpu | ||
| 744 | host | ||
| 745 | build_os | ||
| 746 | build_vendor | ||
| 747 | build_cpu | ||
| 748 | build | ||
| 749 | MAINT | ||
| 750 | target_alias | ||
| 751 | host_alias | ||
| 752 | build_alias | ||
| 753 | LIBS | ||
| 754 | ECHO_T | ||
| 755 | ECHO_N | ||
| 756 | ECHO_C | ||
| 757 | DEFS | ||
| 758 | mandir | ||
| 759 | localedir | ||
| 760 | libdir | ||
| 761 | psdir | ||
| 762 | pdfdir | ||
| 763 | dvidir | ||
| 764 | htmldir | ||
| 765 | infodir | ||
| 766 | docdir | ||
| 767 | oldincludedir | ||
| 768 | includedir | ||
| 769 | localstatedir | ||
| 770 | sharedstatedir | ||
| 771 | sysconfdir | ||
| 772 | datadir | ||
| 773 | datarootdir | ||
| 774 | libexecdir | ||
| 775 | sbindir | ||
| 776 | bindir | ||
| 777 | program_transform_name | ||
| 778 | prefix | ||
| 779 | exec_prefix | ||
| 780 | PACKAGE_BUGREPORT | ||
| 781 | PACKAGE_STRING | ||
| 782 | PACKAGE_VERSION | ||
| 783 | PACKAGE_TARNAME | ||
| 784 | PACKAGE_NAME | ||
| 785 | PATH_SEPARATOR | ||
| 786 | SHELL' | ||
| 785 | ac_subst_files='' | 787 | ac_subst_files='' |
| 786 | ac_user_opts=' | 788 | ac_user_opts=' |
| 787 | enable_option_checking | 789 | enable_option_checking |
| @@ -801,6 +803,7 @@ with_tiff | |||
| 801 | with_gif | 803 | with_gif |
| 802 | with_png | 804 | with_png |
| 803 | with_rsvg | 805 | with_rsvg |
| 806 | with_imagemagick | ||
| 804 | with_xft | 807 | with_xft |
| 805 | with_libotf | 808 | with_libotf |
| 806 | with_m17n_flt | 809 | with_m17n_flt |
| @@ -1258,9 +1261,9 @@ fi | |||
| 1258 | if test -n "$ac_unrecognized_opts"; then | 1261 | if test -n "$ac_unrecognized_opts"; then |
| 1259 | case $enable_option_checking in | 1262 | case $enable_option_checking in |
| 1260 | no) ;; | 1263 | no) ;; |
| 1261 | fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 | 1264 | fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 |
| 1262 | { (exit 1); exit 1; }; } ;; | 1265 | { (exit 1); exit 1; }; } ;; |
| 1263 | *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; | 1266 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
| 1264 | esac | 1267 | esac |
| 1265 | fi | 1268 | fi |
| 1266 | 1269 | ||
| @@ -1313,7 +1316,7 @@ test "$silent" = yes && exec 6>/dev/null | |||
| 1313 | ac_pwd=`pwd` && test -n "$ac_pwd" && | 1316 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
| 1314 | ac_ls_di=`ls -di .` && | 1317 | ac_ls_di=`ls -di .` && |
| 1315 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | 1318 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
| 1316 | { $as_echo "$as_me: error: Working directory cannot be determined" >&2 | 1319 | { $as_echo "$as_me: error: working directory cannot be determined" >&2 |
| 1317 | { (exit 1); exit 1; }; } | 1320 | { (exit 1); exit 1; }; } |
| 1318 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | 1321 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
| 1319 | { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 | 1322 | { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 |
| @@ -1512,6 +1515,7 @@ Optional Packages: | |||
| 1512 | --without-gif don't compile with GIF image support | 1515 | --without-gif don't compile with GIF image support |
| 1513 | --without-png don't compile with PNG image support | 1516 | --without-png don't compile with PNG image support |
| 1514 | --without-rsvg don't compile with SVG image support | 1517 | --without-rsvg don't compile with SVG image support |
| 1518 | --with-imagemagick compile with ImageMagick image support | ||
| 1515 | --without-xft don't use XFT for anti aliased fonts | 1519 | --without-xft don't use XFT for anti aliased fonts |
| 1516 | --without-libotf don't use libotf for OpenType font support | 1520 | --without-libotf don't use libotf for OpenType font support |
| 1517 | --without-m17n-flt don't use m17n-flt for text shaping | 1521 | --without-m17n-flt don't use m17n-flt for text shaping |
| @@ -1610,7 +1614,7 @@ test -n "$ac_init_help" && exit $ac_status | |||
| 1610 | if $ac_init_version; then | 1614 | if $ac_init_version; then |
| 1611 | cat <<\_ACEOF | 1615 | cat <<\_ACEOF |
| 1612 | emacs configure 24.0.50 | 1616 | emacs configure 24.0.50 |
| 1613 | generated by GNU Autoconf 2.62 | 1617 | generated by GNU Autoconf 2.63 |
| 1614 | 1618 | ||
| 1615 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 1619 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| 1616 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 1620 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| @@ -1624,7 +1628,7 @@ This file contains any messages produced by compilers while | |||
| 1624 | running configure, to aid debugging if configure makes a mistake. | 1628 | running configure, to aid debugging if configure makes a mistake. |
| 1625 | 1629 | ||
| 1626 | It was created by emacs $as_me 24.0.50, which was | 1630 | It was created by emacs $as_me 24.0.50, which was |
| 1627 | generated by GNU Autoconf 2.62. Invocation command line was | 1631 | generated by GNU Autoconf 2.63. Invocation command line was |
| 1628 | 1632 | ||
| 1629 | $ $0 $@ | 1633 | $ $0 $@ |
| 1630 | 1634 | ||
| @@ -1747,8 +1751,8 @@ _ASBOX | |||
| 1747 | case $ac_val in #( | 1751 | case $ac_val in #( |
| 1748 | *${as_nl}*) | 1752 | *${as_nl}*) |
| 1749 | case $ac_var in #( | 1753 | case $ac_var in #( |
| 1750 | *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | 1754 | *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 |
| 1751 | $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | 1755 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
| 1752 | esac | 1756 | esac |
| 1753 | case $ac_var in #( | 1757 | case $ac_var in #( |
| 1754 | _ | IFS | as_nl) ;; #( | 1758 | _ | IFS | as_nl) ;; #( |
| @@ -1954,6 +1958,8 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} | |||
| 1954 | fi | 1958 | fi |
| 1955 | done | 1959 | done |
| 1956 | if $ac_cache_corrupted; then | 1960 | if $ac_cache_corrupted; then |
| 1961 | { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
| 1962 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 1957 | { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 | 1963 | { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
| 1958 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | 1964 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
| 1959 | { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | 1965 | { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
| @@ -2233,6 +2239,14 @@ else | |||
| 2233 | fi | 2239 | fi |
| 2234 | 2240 | ||
| 2235 | 2241 | ||
| 2242 | # Check whether --with-imagemagick was given. | ||
| 2243 | if test "${with_imagemagick+set}" = set; then | ||
| 2244 | withval=$with_imagemagick; | ||
| 2245 | else | ||
| 2246 | with_imagemagick=no | ||
| 2247 | fi | ||
| 2248 | |||
| 2249 | |||
| 2236 | 2250 | ||
| 2237 | # Check whether --with-xft was given. | 2251 | # Check whether --with-xft was given. |
| 2238 | if test "${with_xft+set}" = set; then | 2252 | if test "${with_xft+set}" = set; then |
| @@ -2773,15 +2787,6 @@ _ACEOF | |||
| 2773 | esac | 2787 | esac |
| 2774 | ;; | 2788 | ;; |
| 2775 | 2789 | ||
| 2776 | ## LynxOS ports | ||
| 2777 | *-*-lynxos* ) | ||
| 2778 | opsys=lynxos | ||
| 2779 | case "${canonical}" in | ||
| 2780 | i[3456]86-*-lynxos*) machine=intel386 ;; | ||
| 2781 | powerpc-*-lynxos*) machine=powerpc ;; | ||
| 2782 | esac | ||
| 2783 | ;; | ||
| 2784 | |||
| 2785 | alpha*-*-linux-gnu* ) | 2790 | alpha*-*-linux-gnu* ) |
| 2786 | machine=alpha opsys=gnu-linux | 2791 | machine=alpha opsys=gnu-linux |
| 2787 | ;; | 2792 | ;; |
| @@ -2865,30 +2870,14 @@ _ACEOF | |||
| 2865 | 2870 | ||
| 2866 | *-sun-solaris* \ | 2871 | *-sun-solaris* \ |
| 2867 | | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \ | 2872 | | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \ |
| 2868 | | x86_64-*-solaris2* | x86_64-*-sunos5* \ | 2873 | | x86_64-*-solaris2* | x86_64-*-sunos5*) |
| 2869 | | powerpc*-*-solaris2* | rs6000-*-solaris2*) | ||
| 2870 | case "${canonical}" in | 2874 | case "${canonical}" in |
| 2871 | i[3456]86-*-* ) machine=intel386 ;; | 2875 | i[3456]86-*-* ) machine=intel386 ;; |
| 2872 | amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; | 2876 | amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; |
| 2873 | powerpc* | rs6000* ) machine=ibmrs6000 ;; | ||
| 2874 | sparc* ) machine=sparc ;; | 2877 | sparc* ) machine=sparc ;; |
| 2875 | * ) unported=yes ;; | 2878 | * ) unported=yes ;; |
| 2876 | esac | 2879 | esac |
| 2877 | case "${canonical}" in | 2880 | case "${canonical}" in |
| 2878 | *-sunos5.3* | *-solaris2.3* ) | ||
| 2879 | opsys=sol2-3 | ||
| 2880 | NON_GNU_CPP=/usr/ccs/lib/cpp | ||
| 2881 | ;; | ||
| 2882 | *-sunos5.4* | *-solaris2.4* ) | ||
| 2883 | opsys=sol2-4 | ||
| 2884 | NON_GNU_CPP=/usr/ccs/lib/cpp | ||
| 2885 | RANLIB="ar -ts" | ||
| 2886 | ;; | ||
| 2887 | *-sunos5.5* | *-solaris2.5* ) | ||
| 2888 | opsys=sol2-5 | ||
| 2889 | NON_GNU_CPP=/usr/ccs/lib/cpp | ||
| 2890 | RANLIB="ar -ts" | ||
| 2891 | ;; | ||
| 2892 | *-sunos5.6* | *-solaris2.6* ) | 2881 | *-sunos5.6* | *-solaris2.6* ) |
| 2893 | opsys=sol2-6 | 2882 | opsys=sol2-6 |
| 2894 | NON_GNU_CPP=/usr/ccs/lib/cpp | 2883 | NON_GNU_CPP=/usr/ccs/lib/cpp |
| @@ -2979,22 +2968,6 @@ esac | |||
| 2979 | if test x"${opsys}" = x; then | 2968 | if test x"${opsys}" = x; then |
| 2980 | case "${canonical}" in | 2969 | case "${canonical}" in |
| 2981 | *-gnu* ) opsys=gnu ;; | 2970 | *-gnu* ) opsys=gnu ;; |
| 2982 | *-sysv4.2uw* ) opsys=unixware ;; | ||
| 2983 | *-sysv5uw* ) opsys=unixware ;; | ||
| 2984 | *-sysv5OpenUNIX* ) opsys=unixware ;; | ||
| 2985 | *-sysv4.1* | *-sysvr4.1* ) | ||
| 2986 | NON_GNU_CPP=/usr/lib/cpp | ||
| 2987 | opsys=usg5-4 ;; | ||
| 2988 | *-sysv4.[2-9]* | *-sysvr4.[2-9]* ) | ||
| 2989 | if [ x$NON_GNU_CPP = x ]; then | ||
| 2990 | if [ -f /usr/ccs/lib/cpp ]; then | ||
| 2991 | NON_GNU_CPP=/usr/ccs/lib/cpp | ||
| 2992 | else | ||
| 2993 | NON_GNU_CPP=/lib/cpp | ||
| 2994 | fi | ||
| 2995 | fi | ||
| 2996 | opsys=usg5-4-2 ;; | ||
| 2997 | *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;; | ||
| 2998 | * ) | 2971 | * ) |
| 2999 | unported=yes | 2972 | unported=yes |
| 3000 | ;; | 2973 | ;; |
| @@ -3108,12 +3081,8 @@ fi | |||
| 3108 | else | 3081 | else |
| 3109 | case $cross_compiling:$ac_tool_warned in | 3082 | case $cross_compiling:$ac_tool_warned in |
| 3110 | yes:) | 3083 | yes:) |
| 3111 | { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | 3084 | { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 3112 | whose name does not start with the host triplet. If you think this | 3085 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 3113 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
| 3114 | $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
| 3115 | whose name does not start with the host triplet. If you think this | ||
| 3116 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
| 3117 | ac_tool_warned=yes ;; | 3086 | ac_tool_warned=yes ;; |
| 3118 | esac | 3087 | esac |
| 3119 | CC=$ac_ct_CC | 3088 | CC=$ac_ct_CC |
| @@ -3312,12 +3281,8 @@ done | |||
| 3312 | else | 3281 | else |
| 3313 | case $cross_compiling:$ac_tool_warned in | 3282 | case $cross_compiling:$ac_tool_warned in |
| 3314 | yes:) | 3283 | yes:) |
| 3315 | { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | 3284 | { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 3316 | whose name does not start with the host triplet. If you think this | 3285 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 3317 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
| 3318 | $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
| 3319 | whose name does not start with the host triplet. If you think this | ||
| 3320 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
| 3321 | ac_tool_warned=yes ;; | 3286 | ac_tool_warned=yes ;; |
| 3322 | esac | 3287 | esac |
| 3323 | CC=$ac_ct_CC | 3288 | CC=$ac_ct_CC |
| @@ -3327,11 +3292,13 @@ fi | |||
| 3327 | fi | 3292 | fi |
| 3328 | 3293 | ||
| 3329 | 3294 | ||
| 3330 | test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | 3295 | test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 3296 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 3297 | { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH | ||
| 3331 | See \`config.log' for more details." >&5 | 3298 | See \`config.log' for more details." >&5 |
| 3332 | $as_echo "$as_me: error: no acceptable C compiler found in \$PATH | 3299 | $as_echo "$as_me: error: no acceptable C compiler found in \$PATH |
| 3333 | See \`config.log' for more details." >&2;} | 3300 | See \`config.log' for more details." >&2;} |
| 3334 | { (exit 1); exit 1; }; } | 3301 | { (exit 1); exit 1; }; }; } |
| 3335 | 3302 | ||
| 3336 | # Provide some information about the compiler. | 3303 | # Provide some information about the compiler. |
| 3337 | $as_echo "$as_me:$LINENO: checking for C compiler version" >&5 | 3304 | $as_echo "$as_me:$LINENO: checking for C compiler version" >&5 |
| @@ -3461,11 +3428,13 @@ if test -z "$ac_file"; then | |||
| 3461 | $as_echo "$as_me: failed program was:" >&5 | 3428 | $as_echo "$as_me: failed program was:" >&5 |
| 3462 | sed 's/^/| /' conftest.$ac_ext >&5 | 3429 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3463 | 3430 | ||
| 3431 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
| 3432 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 3464 | { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables | 3433 | { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables |
| 3465 | See \`config.log' for more details." >&5 | 3434 | See \`config.log' for more details." >&5 |
| 3466 | $as_echo "$as_me: error: C compiler cannot create executables | 3435 | $as_echo "$as_me: error: C compiler cannot create executables |
| 3467 | See \`config.log' for more details." >&2;} | 3436 | See \`config.log' for more details." >&2;} |
| 3468 | { (exit 77); exit 77; }; } | 3437 | { (exit 77); exit 77; }; }; } |
| 3469 | fi | 3438 | fi |
| 3470 | 3439 | ||
| 3471 | ac_exeext=$ac_cv_exeext | 3440 | ac_exeext=$ac_cv_exeext |
| @@ -3493,13 +3462,15 @@ $as_echo "$ac_try_echo") >&5 | |||
| 3493 | if test "$cross_compiling" = maybe; then | 3462 | if test "$cross_compiling" = maybe; then |
| 3494 | cross_compiling=yes | 3463 | cross_compiling=yes |
| 3495 | else | 3464 | else |
| 3496 | { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. | 3465 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 3466 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 3467 | { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. | ||
| 3497 | If you meant to cross compile, use \`--host'. | 3468 | If you meant to cross compile, use \`--host'. |
| 3498 | See \`config.log' for more details." >&5 | 3469 | See \`config.log' for more details." >&5 |
| 3499 | $as_echo "$as_me: error: cannot run C compiled programs. | 3470 | $as_echo "$as_me: error: cannot run C compiled programs. |
| 3500 | If you meant to cross compile, use \`--host'. | 3471 | If you meant to cross compile, use \`--host'. |
| 3501 | See \`config.log' for more details." >&2;} | 3472 | See \`config.log' for more details." >&2;} |
| 3502 | { (exit 1); exit 1; }; } | 3473 | { (exit 1); exit 1; }; }; } |
| 3503 | fi | 3474 | fi |
| 3504 | fi | 3475 | fi |
| 3505 | fi | 3476 | fi |
| @@ -3542,11 +3513,13 @@ for ac_file in conftest.exe conftest conftest.*; do | |||
| 3542 | esac | 3513 | esac |
| 3543 | done | 3514 | done |
| 3544 | else | 3515 | else |
| 3545 | { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | 3516 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 3517 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 3518 | { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link | ||
| 3546 | See \`config.log' for more details." >&5 | 3519 | See \`config.log' for more details." >&5 |
| 3547 | $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | 3520 | $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link |
| 3548 | See \`config.log' for more details." >&2;} | 3521 | See \`config.log' for more details." >&2;} |
| 3549 | { (exit 1); exit 1; }; } | 3522 | { (exit 1); exit 1; }; }; } |
| 3550 | fi | 3523 | fi |
| 3551 | 3524 | ||
| 3552 | rm -f conftest$ac_cv_exeext | 3525 | rm -f conftest$ac_cv_exeext |
| @@ -3600,11 +3573,13 @@ else | |||
| 3600 | $as_echo "$as_me: failed program was:" >&5 | 3573 | $as_echo "$as_me: failed program was:" >&5 |
| 3601 | sed 's/^/| /' conftest.$ac_ext >&5 | 3574 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3602 | 3575 | ||
| 3576 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 | ||
| 3577 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 3603 | { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile | 3578 | { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
| 3604 | See \`config.log' for more details." >&5 | 3579 | See \`config.log' for more details." >&5 |
| 3605 | $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile | 3580 | $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile |
| 3606 | See \`config.log' for more details." >&2;} | 3581 | See \`config.log' for more details." >&2;} |
| 3607 | { (exit 1); exit 1; }; } | 3582 | { (exit 1); exit 1; }; }; } |
| 3608 | fi | 3583 | fi |
| 3609 | 3584 | ||
| 3610 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 3585 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
| @@ -4276,11 +4251,13 @@ rm -f conftest.err conftest.$ac_ext | |||
| 4276 | if $ac_preproc_ok; then | 4251 | if $ac_preproc_ok; then |
| 4277 | : | 4252 | : |
| 4278 | else | 4253 | else |
| 4279 | { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | 4254 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 4255 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 4256 | { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | ||
| 4280 | See \`config.log' for more details." >&5 | 4257 | See \`config.log' for more details." >&5 |
| 4281 | $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | 4258 | $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check |
| 4282 | See \`config.log' for more details." >&2;} | 4259 | See \`config.log' for more details." >&2;} |
| 4283 | { (exit 1); exit 1; }; } | 4260 | { (exit 1); exit 1; }; }; } |
| 4284 | fi | 4261 | fi |
| 4285 | 4262 | ||
| 4286 | ac_ext=c | 4263 | ac_ext=c |
| @@ -4663,8 +4640,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 4663 | $as_echo "$as_val"'` | 4640 | $as_echo "$as_val"'` |
| 4664 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 4641 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4665 | $as_echo "$ac_res" >&6; } | 4642 | $as_echo "$ac_res" >&6; } |
| 4666 | if test `eval 'as_val=${'$as_ac_Header'} | 4643 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 4667 | $as_echo "$as_val"'` = yes; then | 4644 | $as_echo "$as_val"'` |
| 4645 | if test "x$as_val" = x""yes; then | ||
| 4668 | cat >>confdefs.h <<_ACEOF | 4646 | cat >>confdefs.h <<_ACEOF |
| 4669 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 4647 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 4670 | _ACEOF | 4648 | _ACEOF |
| @@ -4802,7 +4780,7 @@ fi | |||
| 4802 | $as_echo "$ac_cv_header_minix_config_h" >&6; } | 4780 | $as_echo "$ac_cv_header_minix_config_h" >&6; } |
| 4803 | 4781 | ||
| 4804 | fi | 4782 | fi |
| 4805 | if test $ac_cv_header_minix_config_h = yes; then | 4783 | if test "x$ac_cv_header_minix_config_h" = x""yes; then |
| 4806 | MINIX=yes | 4784 | MINIX=yes |
| 4807 | else | 4785 | else |
| 4808 | MINIX= | 4786 | MINIX= |
| @@ -5250,11 +5228,13 @@ rm -f conftest.err conftest.$ac_ext | |||
| 5250 | if $ac_preproc_ok; then | 5228 | if $ac_preproc_ok; then |
| 5251 | : | 5229 | : |
| 5252 | else | 5230 | else |
| 5253 | { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | 5231 | { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 5232 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| 5233 | { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check | ||
| 5254 | See \`config.log' for more details." >&5 | 5234 | See \`config.log' for more details." >&5 |
| 5255 | $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | 5235 | $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check |
| 5256 | See \`config.log' for more details." >&2;} | 5236 | See \`config.log' for more details." >&2;} |
| 5257 | { (exit 1); exit 1; }; } | 5237 | { (exit 1); exit 1; }; }; } |
| 5258 | fi | 5238 | fi |
| 5259 | 5239 | ||
| 5260 | ac_ext=c | 5240 | ac_ext=c |
| @@ -5439,12 +5419,8 @@ fi | |||
| 5439 | else | 5419 | else |
| 5440 | case $cross_compiling:$ac_tool_warned in | 5420 | case $cross_compiling:$ac_tool_warned in |
| 5441 | yes:) | 5421 | yes:) |
| 5442 | { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | 5422 | { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 5443 | whose name does not start with the host triplet. If you think this | 5423 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5444 | configuration is useful to you, please write to autoconf@gnu.org." >&5 | ||
| 5445 | $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | ||
| 5446 | whose name does not start with the host triplet. If you think this | ||
| 5447 | configuration is useful to you, please write to autoconf@gnu.org." >&2;} | ||
| 5448 | ac_tool_warned=yes ;; | 5424 | ac_tool_warned=yes ;; |
| 5449 | esac | 5425 | esac |
| 5450 | RANLIB=$ac_ct_RANLIB | 5426 | RANLIB=$ac_ct_RANLIB |
| @@ -5819,10 +5795,6 @@ configure___ use_mmap_for_buffers=yes | |||
| 5819 | configure___ use_mmap_for_buffers=no | 5795 | configure___ use_mmap_for_buffers=no |
| 5820 | #endif | 5796 | #endif |
| 5821 | 5797 | ||
| 5822 | #ifndef C_DEBUG_SWITCH | ||
| 5823 | #define C_DEBUG_SWITCH -g | ||
| 5824 | #endif | ||
| 5825 | |||
| 5826 | #ifndef C_OPTIMIZE_SWITCH | 5798 | #ifndef C_OPTIMIZE_SWITCH |
| 5827 | #ifdef __GNUC__ | 5799 | #ifdef __GNUC__ |
| 5828 | #define C_OPTIMIZE_SWITCH -O2 | 5800 | #define C_OPTIMIZE_SWITCH -O2 |
| @@ -5854,18 +5826,18 @@ configure___ ld_switch_machine=LD_SWITCH_MACHINE | |||
| 5854 | 5826 | ||
| 5855 | /* Get the CFLAGS for tests in configure. */ | 5827 | /* Get the CFLAGS for tests in configure. */ |
| 5856 | #ifdef __GNUC__ | 5828 | #ifdef __GNUC__ |
| 5857 | configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' | 5829 | configure___ CFLAGS=C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' |
| 5858 | #else | 5830 | #else |
| 5859 | configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' | 5831 | configure___ CFLAGS='${SPECIFIED_CFLAGS}' |
| 5860 | #endif | 5832 | #endif |
| 5861 | 5833 | ||
| 5862 | #else /* not THIS_IS_CONFIGURE */ | 5834 | #else /* not THIS_IS_CONFIGURE */ |
| 5863 | 5835 | ||
| 5864 | /* Get the CFLAGS for real compilation. */ | 5836 | /* Get the CFLAGS for real compilation. */ |
| 5865 | #ifdef __GNUC__ | 5837 | #ifdef __GNUC__ |
| 5866 | configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}' | 5838 | configure___ REAL_CFLAGS=C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}' |
| 5867 | #else | 5839 | #else |
| 5868 | configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' | 5840 | configure___ REAL_CFLAGS='${SPECIFIED_CFLAGS}' |
| 5869 | #endif | 5841 | #endif |
| 5870 | 5842 | ||
| 5871 | #endif /* not THIS_IS_CONFIGURE */ | 5843 | #endif /* not THIS_IS_CONFIGURE */ |
| @@ -6413,8 +6385,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 6413 | $as_echo "$ac_res" >&6; } | 6385 | $as_echo "$ac_res" >&6; } |
| 6414 | 6386 | ||
| 6415 | fi | 6387 | fi |
| 6416 | if test `eval 'as_val=${'$as_ac_Header'} | 6388 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 6417 | $as_echo "$as_val"'` = yes; then | 6389 | $as_echo "$as_val"'` |
| 6390 | if test "x$as_val" = x""yes; then | ||
| 6418 | cat >>confdefs.h <<_ACEOF | 6391 | cat >>confdefs.h <<_ACEOF |
| 6419 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 6392 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 6420 | _ACEOF | 6393 | _ACEOF |
| @@ -6489,7 +6462,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 6489 | fi | 6462 | fi |
| 6490 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 | 6463 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 |
| 6491 | $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } | 6464 | $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } |
| 6492 | if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then | 6465 | if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then |
| 6493 | LIBSOUND=-lossaudio | 6466 | LIBSOUND=-lossaudio |
| 6494 | else | 6467 | else |
| 6495 | LIBSOUND= | 6468 | LIBSOUND= |
| @@ -6867,8 +6840,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 6867 | $as_echo "$ac_res" >&6; } | 6840 | $as_echo "$ac_res" >&6; } |
| 6868 | 6841 | ||
| 6869 | fi | 6842 | fi |
| 6870 | if test `eval 'as_val=${'$as_ac_Header'} | 6843 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 6871 | $as_echo "$as_val"'` = yes; then | 6844 | $as_echo "$as_val"'` |
| 6845 | if test "x$as_val" = x""yes; then | ||
| 6872 | cat >>confdefs.h <<_ACEOF | 6846 | cat >>confdefs.h <<_ACEOF |
| 6873 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 6847 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 6874 | _ACEOF | 6848 | _ACEOF |
| @@ -6981,8 +6955,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 6981 | $as_echo "$as_val"'` | 6955 | $as_echo "$as_val"'` |
| 6982 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 6956 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 6983 | $as_echo "$ac_res" >&6; } | 6957 | $as_echo "$ac_res" >&6; } |
| 6984 | if test `eval 'as_val=${'$as_ac_Header'} | 6958 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 6985 | $as_echo "$as_val"'` = yes; then | 6959 | $as_echo "$as_val"'` |
| 6960 | if test "x$as_val" = x""yes; then | ||
| 6986 | cat >>confdefs.h <<_ACEOF | 6961 | cat >>confdefs.h <<_ACEOF |
| 6987 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 6962 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 6988 | _ACEOF | 6963 | _ACEOF |
| @@ -7284,7 +7259,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 7284 | fi | 7259 | fi |
| 7285 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 | 7260 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 |
| 7286 | $as_echo "$ac_cv_have_decl_sys_siglist" >&6; } | 7261 | $as_echo "$ac_cv_have_decl_sys_siglist" >&6; } |
| 7287 | if test $ac_cv_have_decl_sys_siglist = yes; then | 7262 | if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then |
| 7288 | 7263 | ||
| 7289 | cat >>confdefs.h <<_ACEOF | 7264 | cat >>confdefs.h <<_ACEOF |
| 7290 | #define HAVE_DECL_SYS_SIGLIST 1 | 7265 | #define HAVE_DECL_SYS_SIGLIST 1 |
| @@ -7355,7 +7330,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 7355 | fi | 7330 | fi |
| 7356 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5 | 7331 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5 |
| 7357 | $as_echo "$ac_cv_have_decl___sys_siglist" >&6; } | 7332 | $as_echo "$ac_cv_have_decl___sys_siglist" >&6; } |
| 7358 | if test $ac_cv_have_decl___sys_siglist = yes; then | 7333 | if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then |
| 7359 | 7334 | ||
| 7360 | cat >>confdefs.h <<_ACEOF | 7335 | cat >>confdefs.h <<_ACEOF |
| 7361 | #define HAVE_DECL___SYS_SIGLIST 1 | 7336 | #define HAVE_DECL___SYS_SIGLIST 1 |
| @@ -7897,8 +7872,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 7897 | $as_echo "$ac_res" >&6; } | 7872 | $as_echo "$ac_res" >&6; } |
| 7898 | 7873 | ||
| 7899 | fi | 7874 | fi |
| 7900 | if test `eval 'as_val=${'$as_ac_Header'} | 7875 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 7901 | $as_echo "$as_val"'` = yes; then | 7876 | $as_echo "$as_val"'` |
| 7877 | if test "x$as_val" = x""yes; then | ||
| 7902 | cat >>confdefs.h <<_ACEOF | 7878 | cat >>confdefs.h <<_ACEOF |
| 7903 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 7879 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 7904 | _ACEOF | 7880 | _ACEOF |
| @@ -7961,8 +7937,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 7961 | $as_echo "$as_val"'` | 7937 | $as_echo "$as_val"'` |
| 7962 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 7938 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 7963 | $as_echo "$ac_res" >&6; } | 7939 | $as_echo "$ac_res" >&6; } |
| 7964 | if test `eval 'as_val=${'$as_ac_Header'} | 7940 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 7965 | $as_echo "$as_val"'` = yes; then | 7941 | $as_echo "$as_val"'` |
| 7942 | if test "x$as_val" = x""yes; then | ||
| 7966 | cat >>confdefs.h <<_ACEOF | 7943 | cat >>confdefs.h <<_ACEOF |
| 7967 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 7944 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 7968 | _ACEOF | 7945 | _ACEOF |
| @@ -8135,7 +8112,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8135 | fi | 8112 | fi |
| 8136 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 | 8113 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 |
| 8137 | $as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; } | 8114 | $as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; } |
| 8138 | if test $ac_cv_member_struct_tm_tm_zone = yes; then | 8115 | if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then |
| 8139 | 8116 | ||
| 8140 | cat >>confdefs.h <<_ACEOF | 8117 | cat >>confdefs.h <<_ACEOF |
| 8141 | #define HAVE_STRUCT_TM_TM_ZONE 1 | 8118 | #define HAVE_STRUCT_TM_TM_ZONE 1 |
| @@ -8205,7 +8182,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8205 | fi | 8182 | fi |
| 8206 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5 | 8183 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5 |
| 8207 | $as_echo "$ac_cv_have_decl_tzname" >&6; } | 8184 | $as_echo "$ac_cv_have_decl_tzname" >&6; } |
| 8208 | if test $ac_cv_have_decl_tzname = yes; then | 8185 | if test "x$ac_cv_have_decl_tzname" = x""yes; then |
| 8209 | 8186 | ||
| 8210 | cat >>confdefs.h <<_ACEOF | 8187 | cat >>confdefs.h <<_ACEOF |
| 8211 | #define HAVE_DECL_TZNAME 1 | 8188 | #define HAVE_DECL_TZNAME 1 |
| @@ -8386,7 +8363,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8386 | fi | 8363 | fi |
| 8387 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 | 8364 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 |
| 8388 | $as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; } | 8365 | $as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; } |
| 8389 | if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then | 8366 | if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then |
| 8390 | 8367 | ||
| 8391 | cat >>confdefs.h <<\_ACEOF | 8368 | cat >>confdefs.h <<\_ACEOF |
| 8392 | #define HAVE_TM_GMTOFF 1 | 8369 | #define HAVE_TM_GMTOFF 1 |
| @@ -8503,7 +8480,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8503 | fi | 8480 | fi |
| 8504 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5 | 8481 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5 |
| 8505 | $as_echo "$ac_cv_member_struct_ifreq_ifr_flags" >&6; } | 8482 | $as_echo "$ac_cv_member_struct_ifreq_ifr_flags" >&6; } |
| 8506 | if test $ac_cv_member_struct_ifreq_ifr_flags = yes; then | 8483 | if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then |
| 8507 | 8484 | ||
| 8508 | cat >>confdefs.h <<_ACEOF | 8485 | cat >>confdefs.h <<_ACEOF |
| 8509 | #define HAVE_STRUCT_IFREQ_IFR_FLAGS 1 | 8486 | #define HAVE_STRUCT_IFREQ_IFR_FLAGS 1 |
| @@ -8620,7 +8597,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8620 | fi | 8597 | fi |
| 8621 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5 | 8598 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5 |
| 8622 | $as_echo "$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6; } | 8599 | $as_echo "$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6; } |
| 8623 | if test $ac_cv_member_struct_ifreq_ifr_hwaddr = yes; then | 8600 | if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then |
| 8624 | 8601 | ||
| 8625 | cat >>confdefs.h <<_ACEOF | 8602 | cat >>confdefs.h <<_ACEOF |
| 8626 | #define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 | 8603 | #define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 |
| @@ -8737,7 +8714,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8737 | fi | 8714 | fi |
| 8738 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5 | 8715 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5 |
| 8739 | $as_echo "$ac_cv_member_struct_ifreq_ifr_netmask" >&6; } | 8716 | $as_echo "$ac_cv_member_struct_ifreq_ifr_netmask" >&6; } |
| 8740 | if test $ac_cv_member_struct_ifreq_ifr_netmask = yes; then | 8717 | if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then |
| 8741 | 8718 | ||
| 8742 | cat >>confdefs.h <<_ACEOF | 8719 | cat >>confdefs.h <<_ACEOF |
| 8743 | #define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 | 8720 | #define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 |
| @@ -8854,7 +8831,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8854 | fi | 8831 | fi |
| 8855 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr" >&5 | 8832 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr" >&5 |
| 8856 | $as_echo "$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6; } | 8833 | $as_echo "$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6; } |
| 8857 | if test $ac_cv_member_struct_ifreq_ifr_broadaddr = yes; then | 8834 | if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then |
| 8858 | 8835 | ||
| 8859 | cat >>confdefs.h <<_ACEOF | 8836 | cat >>confdefs.h <<_ACEOF |
| 8860 | #define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 | 8837 | #define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 |
| @@ -8971,7 +8948,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 8971 | fi | 8948 | fi |
| 8972 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5 | 8949 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5 |
| 8973 | $as_echo "$ac_cv_member_struct_ifreq_ifr_addr" >&6; } | 8950 | $as_echo "$ac_cv_member_struct_ifreq_ifr_addr" >&6; } |
| 8974 | if test $ac_cv_member_struct_ifreq_ifr_addr = yes; then | 8951 | if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then |
| 8975 | 8952 | ||
| 8976 | cat >>confdefs.h <<_ACEOF | 8953 | cat >>confdefs.h <<_ACEOF |
| 8977 | #define HAVE_STRUCT_IFREQ_IFR_ADDR 1 | 8954 | #define HAVE_STRUCT_IFREQ_IFR_ADDR 1 |
| @@ -9402,8 +9379,8 @@ if test "x$with_x" = xno; then | |||
| 9402 | have_x=disabled | 9379 | have_x=disabled |
| 9403 | else | 9380 | else |
| 9404 | case $x_includes,$x_libraries in #( | 9381 | case $x_includes,$x_libraries in #( |
| 9405 | *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 | 9382 | *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 |
| 9406 | $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;} | 9383 | $as_echo "$as_me: error: cannot use X directory names containing '" >&2;} |
| 9407 | { (exit 1); exit 1; }; };; #( | 9384 | { (exit 1); exit 1; }; };; #( |
| 9408 | *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then | 9385 | *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then |
| 9409 | $as_echo_n "(cached) " >&6 | 9386 | $as_echo_n "(cached) " >&6 |
| @@ -9441,7 +9418,7 @@ _ACEOF | |||
| 9441 | *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; | 9418 | *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; |
| 9442 | esac | 9419 | esac |
| 9443 | case $ac_im_usrlibdir in | 9420 | case $ac_im_usrlibdir in |
| 9444 | /usr/lib | /lib) ;; | 9421 | /usr/lib | /usr/lib64 | /lib | /lib64) ;; |
| 9445 | *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; | 9422 | *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; |
| 9446 | esac | 9423 | esac |
| 9447 | fi | 9424 | fi |
| @@ -9850,7 +9827,7 @@ fi | |||
| 9850 | $as_echo "$ac_cv_header_AppKit_AppKit_h" >&6; } | 9827 | $as_echo "$ac_cv_header_AppKit_AppKit_h" >&6; } |
| 9851 | 9828 | ||
| 9852 | fi | 9829 | fi |
| 9853 | if test $ac_cv_header_AppKit_AppKit_h = yes; then | 9830 | if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then |
| 9854 | HAVE_NS=yes | 9831 | HAVE_NS=yes |
| 9855 | else | 9832 | else |
| 9856 | { { $as_echo "$as_me:$LINENO: error: \`--with-ns' was specified, but the include | 9833 | { { $as_echo "$as_me:$LINENO: error: \`--with-ns' was specified, but the include |
| @@ -10098,7 +10075,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 10098 | fi | 10075 | fi |
| 10099 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5 | 10076 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5 |
| 10100 | $as_echo "$ac_cv_func_malloc_get_state" >&6; } | 10077 | $as_echo "$ac_cv_func_malloc_get_state" >&6; } |
| 10101 | if test $ac_cv_func_malloc_get_state = yes; then | 10078 | if test "x$ac_cv_func_malloc_get_state" = x""yes; then |
| 10102 | : | 10079 | : |
| 10103 | else | 10080 | else |
| 10104 | doug_lea_malloc=no | 10081 | doug_lea_malloc=no |
| @@ -10189,7 +10166,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 10189 | fi | 10166 | fi |
| 10190 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5 | 10167 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5 |
| 10191 | $as_echo "$ac_cv_func_malloc_set_state" >&6; } | 10168 | $as_echo "$ac_cv_func_malloc_set_state" >&6; } |
| 10192 | if test $ac_cv_func_malloc_set_state = yes; then | 10169 | if test "x$ac_cv_func_malloc_set_state" = x""yes; then |
| 10193 | : | 10170 | : |
| 10194 | else | 10171 | else |
| 10195 | doug_lea_malloc=no | 10172 | doug_lea_malloc=no |
| @@ -10411,8 +10388,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 10411 | $as_echo "$ac_res" >&6; } | 10388 | $as_echo "$ac_res" >&6; } |
| 10412 | 10389 | ||
| 10413 | fi | 10390 | fi |
| 10414 | if test `eval 'as_val=${'$as_ac_Header'} | 10391 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 10415 | $as_echo "$as_val"'` = yes; then | 10392 | $as_echo "$as_val"'` |
| 10393 | if test "x$as_val" = x""yes; then | ||
| 10416 | cat >>confdefs.h <<_ACEOF | 10394 | cat >>confdefs.h <<_ACEOF |
| 10417 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 10395 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 10418 | _ACEOF | 10396 | _ACEOF |
| @@ -10512,8 +10490,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 10512 | $as_echo "$as_val"'` | 10490 | $as_echo "$as_val"'` |
| 10513 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 10491 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 10514 | $as_echo "$ac_res" >&6; } | 10492 | $as_echo "$ac_res" >&6; } |
| 10515 | if test `eval 'as_val=${'$as_ac_var'} | 10493 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 10516 | $as_echo "$as_val"'` = yes; then | 10494 | $as_echo "$as_val"'` |
| 10495 | if test "x$as_val" = x""yes; then | ||
| 10517 | cat >>confdefs.h <<_ACEOF | 10496 | cat >>confdefs.h <<_ACEOF |
| 10518 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10497 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 10519 | _ACEOF | 10498 | _ACEOF |
| @@ -10782,7 +10761,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10782 | fi | 10761 | fi |
| 10783 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 | 10762 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 |
| 10784 | $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } | 10763 | $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } |
| 10785 | if test $ac_cv_lib_dnet_dnet_ntoa = yes; then | 10764 | if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then |
| 10786 | cat >>confdefs.h <<_ACEOF | 10765 | cat >>confdefs.h <<_ACEOF |
| 10787 | #define HAVE_LIBDNET 1 | 10766 | #define HAVE_LIBDNET 1 |
| 10788 | _ACEOF | 10767 | _ACEOF |
| @@ -10851,7 +10830,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10851 | fi | 10830 | fi |
| 10852 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 | 10831 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 |
| 10853 | $as_echo "$ac_cv_lib_Xbsd_main" >&6; } | 10832 | $as_echo "$ac_cv_lib_Xbsd_main" >&6; } |
| 10854 | if test $ac_cv_lib_Xbsd_main = yes; then | 10833 | if test "x$ac_cv_lib_Xbsd_main" = x""yes; then |
| 10855 | LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" | 10834 | LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" |
| 10856 | fi | 10835 | fi |
| 10857 | 10836 | ||
| @@ -10922,7 +10901,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 10922 | fi | 10901 | fi |
| 10923 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5 | 10902 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5 |
| 10924 | $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; } | 10903 | $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; } |
| 10925 | if test $ac_cv_lib_pthreads_cma_open = yes; then | 10904 | if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then |
| 10926 | cat >>confdefs.h <<_ACEOF | 10905 | cat >>confdefs.h <<_ACEOF |
| 10927 | #define HAVE_LIBPTHREADS 1 | 10906 | #define HAVE_LIBPTHREADS 1 |
| 10928 | _ACEOF | 10907 | _ACEOF |
| @@ -11305,8 +11284,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 11305 | $as_echo "$as_val"'` | 11284 | $as_echo "$as_val"'` |
| 11306 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 11285 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 11307 | $as_echo "$ac_res" >&6; } | 11286 | $as_echo "$ac_res" >&6; } |
| 11308 | if test `eval 'as_val=${'$as_ac_var'} | 11287 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 11309 | $as_echo "$as_val"'` = yes; then | 11288 | $as_echo "$as_val"'` |
| 11289 | if test "x$as_val" = x""yes; then | ||
| 11310 | cat >>confdefs.h <<_ACEOF | 11290 | cat >>confdefs.h <<_ACEOF |
| 11311 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11291 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 11312 | _ACEOF | 11292 | _ACEOF |
| @@ -11506,6 +11486,121 @@ _ACEOF | |||
| 11506 | fi | 11486 | fi |
| 11507 | fi | 11487 | fi |
| 11508 | 11488 | ||
| 11489 | HAVE_IMAGEMAGICK=no | ||
| 11490 | if test "${HAVE_X11}" = "yes" ; then | ||
| 11491 | if test "${with_imagemagick}" != "no"; then | ||
| 11492 | IMAGEMAGICK_REQUIRED=1 | ||
| 11493 | IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED" | ||
| 11494 | |||
| 11495 | |||
| 11496 | succeeded=no | ||
| 11497 | |||
| 11498 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
| 11499 | set dummy pkg-config; ac_word=$2 | ||
| 11500 | { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
| 11501 | $as_echo_n "checking for $ac_word... " >&6; } | ||
| 11502 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then | ||
| 11503 | $as_echo_n "(cached) " >&6 | ||
| 11504 | else | ||
| 11505 | case $PKG_CONFIG in | ||
| 11506 | [\\/]* | ?:[\\/]*) | ||
| 11507 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
| 11508 | ;; | ||
| 11509 | *) | ||
| 11510 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
| 11511 | for as_dir in $PATH | ||
| 11512 | do | ||
| 11513 | IFS=$as_save_IFS | ||
| 11514 | test -z "$as_dir" && as_dir=. | ||
| 11515 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
| 11516 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
| 11517 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
| 11518 | $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
| 11519 | break 2 | ||
| 11520 | fi | ||
| 11521 | done | ||
| 11522 | done | ||
| 11523 | IFS=$as_save_IFS | ||
| 11524 | |||
| 11525 | test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" | ||
| 11526 | ;; | ||
| 11527 | esac | ||
| 11528 | fi | ||
| 11529 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
| 11530 | if test -n "$PKG_CONFIG"; then | ||
| 11531 | { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | ||
| 11532 | $as_echo "$PKG_CONFIG" >&6; } | ||
| 11533 | else | ||
| 11534 | { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
| 11535 | $as_echo "no" >&6; } | ||
| 11536 | fi | ||
| 11537 | |||
| 11538 | |||
| 11539 | |||
| 11540 | if test "$PKG_CONFIG" = "no" ; then | ||
| 11541 | : | ||
| 11542 | else | ||
| 11543 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
| 11544 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
| 11545 | { $as_echo "$as_me:$LINENO: checking for $IMAGEMAGICK_MODULE" >&5 | ||
| 11546 | $as_echo_n "checking for $IMAGEMAGICK_MODULE... " >&6; } | ||
| 11547 | |||
| 11548 | if $PKG_CONFIG --exists "$IMAGEMAGICK_MODULE" 2>&5; then | ||
| 11549 | { $as_echo "$as_me:$LINENO: result: yes" >&5 | ||
| 11550 | $as_echo "yes" >&6; } | ||
| 11551 | succeeded=yes | ||
| 11552 | |||
| 11553 | { $as_echo "$as_me:$LINENO: checking IMAGEMAGICK_CFLAGS" >&5 | ||
| 11554 | $as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; } | ||
| 11555 | IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` | ||
| 11556 | { $as_echo "$as_me:$LINENO: result: $IMAGEMAGICK_CFLAGS" >&5 | ||
| 11557 | $as_echo "$IMAGEMAGICK_CFLAGS" >&6; } | ||
| 11558 | |||
| 11559 | { $as_echo "$as_me:$LINENO: checking IMAGEMAGICK_LIBS" >&5 | ||
| 11560 | $as_echo_n "checking IMAGEMAGICK_LIBS... " >&6; } | ||
| 11561 | IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` | ||
| 11562 | { $as_echo "$as_me:$LINENO: result: $IMAGEMAGICK_LIBS" >&5 | ||
| 11563 | $as_echo "$IMAGEMAGICK_LIBS" >&6; } | ||
| 11564 | else | ||
| 11565 | { $as_echo "$as_me:$LINENO: result: no" >&5 | ||
| 11566 | $as_echo "no" >&6; } | ||
| 11567 | IMAGEMAGICK_CFLAGS="" | ||
| 11568 | IMAGEMAGICK_LIBS="" | ||
| 11569 | ## If we have a custom action on failure, don't print errors, but | ||
| 11570 | ## do set a variable so people can do so. | ||
| 11571 | IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$IMAGEMAGICK_MODULE"` | ||
| 11572 | |||
| 11573 | fi | ||
| 11574 | |||
| 11575 | |||
| 11576 | |||
| 11577 | else | ||
| 11578 | echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." | ||
| 11579 | echo "*** See http://www.freedesktop.org/software/pkgconfig" | ||
| 11580 | fi | ||
| 11581 | fi | ||
| 11582 | |||
| 11583 | if test $succeeded = yes; then | ||
| 11584 | : | ||
| 11585 | else | ||
| 11586 | : | ||
| 11587 | fi | ||
| 11588 | |||
| 11589 | |||
| 11590 | |||
| 11591 | |||
| 11592 | if test ".${IMAGEMAGICK_CFLAGS}" != "."; then | ||
| 11593 | HAVE_IMAGEMAGICK=yes | ||
| 11594 | |||
| 11595 | cat >>confdefs.h <<\_ACEOF | ||
| 11596 | #define HAVE_IMAGEMAGICK 1 | ||
| 11597 | _ACEOF | ||
| 11598 | |||
| 11599 | CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" | ||
| 11600 | LIBS="$IMAGEMAGICK_LIBS $LIBS" | ||
| 11601 | fi | ||
| 11602 | fi | ||
| 11603 | fi | ||
| 11509 | 11604 | ||
| 11510 | HAVE_GTK=no | 11605 | HAVE_GTK=no |
| 11511 | if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then | 11606 | if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then |
| @@ -11714,8 +11809,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 11714 | $as_echo "$as_val"'` | 11809 | $as_echo "$as_val"'` |
| 11715 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 11810 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 11716 | $as_echo "$ac_res" >&6; } | 11811 | $as_echo "$ac_res" >&6; } |
| 11717 | if test `eval 'as_val=${'$as_ac_var'} | 11812 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 11718 | $as_echo "$as_val"'` = yes; then | 11813 | $as_echo "$as_val"'` |
| 11814 | if test "x$as_val" = x""yes; then | ||
| 11719 | cat >>confdefs.h <<_ACEOF | 11815 | cat >>confdefs.h <<_ACEOF |
| 11720 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11816 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 11721 | _ACEOF | 11817 | _ACEOF |
| @@ -11853,8 +11949,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 11853 | $as_echo "$as_val"'` | 11949 | $as_echo "$as_val"'` |
| 11854 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 11950 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 11855 | $as_echo "$ac_res" >&6; } | 11951 | $as_echo "$ac_res" >&6; } |
| 11856 | if test `eval 'as_val=${'$as_ac_var'} | 11952 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 11857 | $as_echo "$as_val"'` = yes; then | 11953 | $as_echo "$as_val"'` |
| 11954 | if test "x$as_val" = x""yes; then | ||
| 11858 | cat >>confdefs.h <<_ACEOF | 11955 | cat >>confdefs.h <<_ACEOF |
| 11859 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11956 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 11860 | _ACEOF | 11957 | _ACEOF |
| @@ -11926,7 +12023,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 11926 | fi | 12023 | fi |
| 11927 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&5 | 12024 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&5 |
| 11928 | $as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&6; } | 12025 | $as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&6; } |
| 11929 | if test $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION = yes; then | 12026 | if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then |
| 11930 | HAVE_GTK_FILE_SELECTION=yes | 12027 | HAVE_GTK_FILE_SELECTION=yes |
| 11931 | else | 12028 | else |
| 11932 | HAVE_GTK_FILE_SELECTION=no | 12029 | HAVE_GTK_FILE_SELECTION=no |
| @@ -12024,8 +12121,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 12024 | $as_echo "$as_val"'` | 12121 | $as_echo "$as_val"'` |
| 12025 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 12122 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 12026 | $as_echo "$ac_res" >&6; } | 12123 | $as_echo "$ac_res" >&6; } |
| 12027 | if test `eval 'as_val=${'$as_ac_var'} | 12124 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 12028 | $as_echo "$as_val"'` = yes; then | 12125 | $as_echo "$as_val"'` |
| 12126 | if test "x$as_val" = x""yes; then | ||
| 12029 | cat >>confdefs.h <<_ACEOF | 12127 | cat >>confdefs.h <<_ACEOF |
| 12030 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 12128 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 12031 | _ACEOF | 12129 | _ACEOF |
| @@ -12093,7 +12191,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 12093 | fi | 12191 | fi |
| 12094 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&5 | 12192 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&5 |
| 12095 | $as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&6; } | 12193 | $as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&6; } |
| 12096 | if test $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER = yes; then | 12194 | if test "x$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" = x""yes; then |
| 12097 | HAVE_GTK_FILE_CHOOSER=yes | 12195 | HAVE_GTK_FILE_CHOOSER=yes |
| 12098 | else | 12196 | else |
| 12099 | HAVE_GTK_FILE_CHOOSER=no | 12197 | HAVE_GTK_FILE_CHOOSER=no |
| @@ -12191,8 +12289,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 12191 | $as_echo "$as_val"'` | 12289 | $as_echo "$as_val"'` |
| 12192 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 12290 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 12193 | $as_echo "$ac_res" >&6; } | 12291 | $as_echo "$ac_res" >&6; } |
| 12194 | if test `eval 'as_val=${'$as_ac_var'} | 12292 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 12195 | $as_echo "$as_val"'` = yes; then | 12293 | $as_echo "$as_val"'` |
| 12294 | if test "x$as_val" = x""yes; then | ||
| 12196 | cat >>confdefs.h <<_ACEOF | 12295 | cat >>confdefs.h <<_ACEOF |
| 12197 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 12296 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 12198 | _ACEOF | 12297 | _ACEOF |
| @@ -12350,8 +12449,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 12350 | $as_echo "$ac_res" >&6; } | 12449 | $as_echo "$ac_res" >&6; } |
| 12351 | 12450 | ||
| 12352 | fi | 12451 | fi |
| 12353 | if test `eval 'as_val=${'$as_ac_Header'} | 12452 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 12354 | $as_echo "$as_val"'` = yes; then | 12453 | $as_echo "$as_val"'` |
| 12454 | if test "x$as_val" = x""yes; then | ||
| 12355 | cat >>confdefs.h <<_ACEOF | 12455 | cat >>confdefs.h <<_ACEOF |
| 12356 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 12456 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 12357 | _ACEOF | 12457 | _ACEOF |
| @@ -12426,7 +12526,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 12426 | fi | 12526 | fi |
| 12427 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5 | 12527 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5 |
| 12428 | $as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } | 12528 | $as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } |
| 12429 | if test $ac_cv_lib_pthread_pthread_self = yes; then | 12529 | if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then |
| 12430 | HAVE_GTK_AND_PTHREAD=yes | 12530 | HAVE_GTK_AND_PTHREAD=yes |
| 12431 | fi | 12531 | fi |
| 12432 | 12532 | ||
| @@ -12639,8 +12739,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 12639 | $as_echo "$as_val"'` | 12739 | $as_echo "$as_val"'` |
| 12640 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 12740 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 12641 | $as_echo "$ac_res" >&6; } | 12741 | $as_echo "$ac_res" >&6; } |
| 12642 | if test `eval 'as_val=${'$as_ac_var'} | 12742 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 12643 | $as_echo "$as_val"'` = yes; then | 12743 | $as_echo "$as_val"'` |
| 12744 | if test "x$as_val" = x""yes; then | ||
| 12644 | cat >>confdefs.h <<_ACEOF | 12745 | cat >>confdefs.h <<_ACEOF |
| 12645 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 12746 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 12646 | _ACEOF | 12747 | _ACEOF |
| @@ -13049,7 +13150,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13049 | fi | 13150 | fi |
| 13050 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 | 13151 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 |
| 13051 | $as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } | 13152 | $as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } |
| 13052 | if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then | 13153 | if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then |
| 13053 | cat >>confdefs.h <<_ACEOF | 13154 | cat >>confdefs.h <<_ACEOF |
| 13054 | #define HAVE_LIBXMU 1 | 13155 | #define HAVE_LIBXMU 1 |
| 13055 | _ACEOF | 13156 | _ACEOF |
| @@ -13130,7 +13231,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13130 | fi | 13231 | fi |
| 13131 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 | 13232 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 |
| 13132 | $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } | 13233 | $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } |
| 13133 | if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then | 13234 | if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then |
| 13134 | cat >>confdefs.h <<_ACEOF | 13235 | cat >>confdefs.h <<_ACEOF |
| 13135 | #define HAVE_LIBXEXT 1 | 13236 | #define HAVE_LIBXEXT 1 |
| 13136 | _ACEOF | 13237 | _ACEOF |
| @@ -13270,7 +13371,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13270 | fi | 13371 | fi |
| 13271 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5 | 13372 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5 |
| 13272 | $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; } | 13373 | $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; } |
| 13273 | if test $ac_cv_lib_Xp_XpCreateContext = yes; then | 13374 | if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then |
| 13274 | HAVE_LIBXP=yes | 13375 | HAVE_LIBXP=yes |
| 13275 | fi | 13376 | fi |
| 13276 | 13377 | ||
| @@ -13795,7 +13896,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 13795 | fi | 13896 | fi |
| 13796 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 | 13897 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 |
| 13797 | $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } | 13898 | $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } |
| 13798 | if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then | 13899 | if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then |
| 13799 | HAVE_XRENDER=yes | 13900 | HAVE_XRENDER=yes |
| 13800 | fi | 13901 | fi |
| 13801 | 13902 | ||
| @@ -13934,7 +14035,7 @@ fi | |||
| 13934 | $as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; } | 14035 | $as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; } |
| 13935 | 14036 | ||
| 13936 | fi | 14037 | fi |
| 13937 | if test $ac_cv_header_X11_Xft_Xft_h = yes; then | 14038 | if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then |
| 13938 | { $as_echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 | 14039 | { $as_echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 |
| 13939 | $as_echo_n "checking for XftFontOpen in -lXft... " >&6; } | 14040 | $as_echo_n "checking for XftFontOpen in -lXft... " >&6; } |
| 13940 | if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then | 14041 | if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then |
| @@ -14000,7 +14101,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 14000 | fi | 14101 | fi |
| 14001 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5 | 14102 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5 |
| 14002 | $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; } | 14103 | $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; } |
| 14003 | if test $ac_cv_lib_Xft_XftFontOpen = yes; then | 14104 | if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then |
| 14004 | HAVE_XFT=yes | 14105 | HAVE_XFT=yes |
| 14005 | fi | 14106 | fi |
| 14006 | 14107 | ||
| @@ -14211,7 +14312,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 14211 | fi | 14312 | fi |
| 14212 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 | 14313 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 |
| 14213 | $as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } | 14314 | $as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } |
| 14214 | if test $ac_cv_lib_otf_OTF_get_variation_glyphs = yes; then | 14315 | if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then |
| 14215 | HAVE_OTF_GET_VARIATION_GLYPHS=yes | 14316 | HAVE_OTF_GET_VARIATION_GLYPHS=yes |
| 14216 | else | 14317 | else |
| 14217 | HAVE_OTF_GET_VARIATION_GLYPHS=no | 14318 | HAVE_OTF_GET_VARIATION_GLYPHS=no |
| @@ -14483,7 +14584,7 @@ fi | |||
| 14483 | $as_echo "$ac_cv_header_X11_xpm_h" >&6; } | 14584 | $as_echo "$ac_cv_header_X11_xpm_h" >&6; } |
| 14484 | 14585 | ||
| 14485 | fi | 14586 | fi |
| 14486 | if test $ac_cv_header_X11_xpm_h = yes; then | 14587 | if test "x$ac_cv_header_X11_xpm_h" = x""yes; then |
| 14487 | { $as_echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 | 14588 | { $as_echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 |
| 14488 | $as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; } | 14589 | $as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; } |
| 14489 | if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then | 14590 | if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then |
| @@ -14549,7 +14650,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 14549 | fi | 14650 | fi |
| 14550 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 | 14651 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 |
| 14551 | $as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } | 14652 | $as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } |
| 14552 | if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then | 14653 | if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then |
| 14553 | HAVE_XPM=yes | 14654 | HAVE_XPM=yes |
| 14554 | fi | 14655 | fi |
| 14555 | 14656 | ||
| @@ -14733,7 +14834,7 @@ fi | |||
| 14733 | $as_echo "$ac_cv_header_jerror_h" >&6; } | 14834 | $as_echo "$ac_cv_header_jerror_h" >&6; } |
| 14734 | 14835 | ||
| 14735 | fi | 14836 | fi |
| 14736 | if test $ac_cv_header_jerror_h = yes; then | 14837 | if test "x$ac_cv_header_jerror_h" = x""yes; then |
| 14737 | { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 | 14838 | { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 |
| 14738 | $as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; } | 14839 | $as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; } |
| 14739 | if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then | 14840 | if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then |
| @@ -14799,7 +14900,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 14799 | fi | 14900 | fi |
| 14800 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 | 14901 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 |
| 14801 | $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } | 14902 | $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } |
| 14802 | if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then | 14903 | if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then |
| 14803 | HAVE_JPEG=yes | 14904 | HAVE_JPEG=yes |
| 14804 | fi | 14905 | fi |
| 14805 | 14906 | ||
| @@ -14987,8 +15088,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 14987 | $as_echo "$ac_res" >&6; } | 15088 | $as_echo "$ac_res" >&6; } |
| 14988 | 15089 | ||
| 14989 | fi | 15090 | fi |
| 14990 | if test `eval 'as_val=${'$as_ac_Header'} | 15091 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 14991 | $as_echo "$as_val"'` = yes; then | 15092 | $as_echo "$as_val"'` |
| 15093 | if test "x$as_val" = x""yes; then | ||
| 14992 | cat >>confdefs.h <<_ACEOF | 15094 | cat >>confdefs.h <<_ACEOF |
| 14993 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 15095 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 14994 | _ACEOF | 15096 | _ACEOF |
| @@ -15063,7 +15165,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 15063 | fi | 15165 | fi |
| 15064 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5 | 15166 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5 |
| 15065 | $as_echo "$ac_cv_lib_png_png_get_channels" >&6; } | 15167 | $as_echo "$ac_cv_lib_png_png_get_channels" >&6; } |
| 15066 | if test $ac_cv_lib_png_png_get_channels = yes; then | 15168 | if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then |
| 15067 | HAVE_PNG=yes | 15169 | HAVE_PNG=yes |
| 15068 | fi | 15170 | fi |
| 15069 | 15171 | ||
| @@ -15213,7 +15315,7 @@ fi | |||
| 15213 | $as_echo "$ac_cv_header_tiffio_h" >&6; } | 15315 | $as_echo "$ac_cv_header_tiffio_h" >&6; } |
| 15214 | 15316 | ||
| 15215 | fi | 15317 | fi |
| 15216 | if test $ac_cv_header_tiffio_h = yes; then | 15318 | if test "x$ac_cv_header_tiffio_h" = x""yes; then |
| 15217 | tifflibs="-lz -lm" | 15319 | tifflibs="-lz -lm" |
| 15218 | # At least one tiff package requires the jpeg library. | 15320 | # At least one tiff package requires the jpeg library. |
| 15219 | if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi | 15321 | if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi |
| @@ -15282,7 +15384,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 15282 | fi | 15384 | fi |
| 15283 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 | 15385 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 |
| 15284 | $as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; } | 15386 | $as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; } |
| 15285 | if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then | 15387 | if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then |
| 15286 | HAVE_TIFF=yes | 15388 | HAVE_TIFF=yes |
| 15287 | fi | 15389 | fi |
| 15288 | 15390 | ||
| @@ -15433,7 +15535,7 @@ fi | |||
| 15433 | $as_echo "$ac_cv_header_gif_lib_h" >&6; } | 15535 | $as_echo "$ac_cv_header_gif_lib_h" >&6; } |
| 15434 | 15536 | ||
| 15435 | fi | 15537 | fi |
| 15436 | if test $ac_cv_header_gif_lib_h = yes; then | 15538 | if test "x$ac_cv_header_gif_lib_h" = x""yes; then |
| 15437 | # EGifPutExtensionLast only exists from version libungif-4.1.0b1. | 15539 | # EGifPutExtensionLast only exists from version libungif-4.1.0b1. |
| 15438 | # Earlier versions can crash Emacs. | 15540 | # Earlier versions can crash Emacs. |
| 15439 | { $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 | 15541 | { $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5 |
| @@ -15501,7 +15603,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 15501 | fi | 15603 | fi |
| 15502 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 | 15604 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 |
| 15503 | $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } | 15605 | $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } |
| 15504 | if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then | 15606 | if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then |
| 15505 | HAVE_GIF=yes | 15607 | HAVE_GIF=yes |
| 15506 | else | 15608 | else |
| 15507 | HAVE_GIF=maybe | 15609 | HAVE_GIF=maybe |
| @@ -15580,7 +15682,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 15580 | fi | 15682 | fi |
| 15581 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 | 15683 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 |
| 15582 | $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } | 15684 | $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } |
| 15583 | if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then | 15685 | if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then |
| 15584 | HAVE_GIF=yes | 15686 | HAVE_GIF=yes |
| 15585 | else | 15687 | else |
| 15586 | HAVE_GIF=no | 15688 | HAVE_GIF=no |
| @@ -15761,7 +15863,7 @@ fi | |||
| 15761 | $as_echo "$ac_cv_header_gpm_h" >&6; } | 15863 | $as_echo "$ac_cv_header_gpm_h" >&6; } |
| 15762 | 15864 | ||
| 15763 | fi | 15865 | fi |
| 15764 | if test $ac_cv_header_gpm_h = yes; then | 15866 | if test "x$ac_cv_header_gpm_h" = x""yes; then |
| 15765 | { $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5 | 15867 | { $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5 |
| 15766 | $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } | 15868 | $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } |
| 15767 | if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then | 15869 | if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then |
| @@ -15827,7 +15929,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 15827 | fi | 15929 | fi |
| 15828 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5 | 15930 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5 |
| 15829 | $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } | 15931 | $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } |
| 15830 | if test $ac_cv_lib_gpm_Gpm_Open = yes; then | 15932 | if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then |
| 15831 | HAVE_GPM=yes | 15933 | HAVE_GPM=yes |
| 15832 | fi | 15934 | fi |
| 15833 | 15935 | ||
| @@ -15973,7 +16075,7 @@ fi | |||
| 15973 | $as_echo "$ac_cv_header_malloc_malloc_h" >&6; } | 16075 | $as_echo "$ac_cv_header_malloc_malloc_h" >&6; } |
| 15974 | 16076 | ||
| 15975 | fi | 16077 | fi |
| 15976 | if test $ac_cv_header_malloc_malloc_h = yes; then | 16078 | if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then |
| 15977 | 16079 | ||
| 15978 | cat >>confdefs.h <<\_ACEOF | 16080 | cat >>confdefs.h <<\_ACEOF |
| 15979 | #define HAVE_MALLOC_MALLOC_H 1 | 16081 | #define HAVE_MALLOC_MALLOC_H 1 |
| @@ -16149,7 +16251,7 @@ fi | |||
| 16149 | $as_echo "$ac_cv_header_X11_SM_SMlib_h" >&6; } | 16251 | $as_echo "$ac_cv_header_X11_SM_SMlib_h" >&6; } |
| 16150 | 16252 | ||
| 16151 | fi | 16253 | fi |
| 16152 | if test $ac_cv_header_X11_SM_SMlib_h = yes; then | 16254 | if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then |
| 16153 | { $as_echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 | 16255 | { $as_echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 |
| 16154 | $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } | 16256 | $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } |
| 16155 | if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then | 16257 | if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then |
| @@ -16215,7 +16317,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 16215 | fi | 16317 | fi |
| 16216 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 | 16318 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 |
| 16217 | $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } | 16319 | $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } |
| 16218 | if test $ac_cv_lib_SM_SmcOpenConnection = yes; then | 16320 | if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then |
| 16219 | HAVE_X_SM=yes | 16321 | HAVE_X_SM=yes |
| 16220 | fi | 16322 | fi |
| 16221 | 16323 | ||
| @@ -16581,8 +16683,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 16581 | $as_echo "$as_val"'` | 16683 | $as_echo "$as_val"'` |
| 16582 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 16684 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 16583 | $as_echo "$ac_res" >&6; } | 16685 | $as_echo "$ac_res" >&6; } |
| 16584 | if test `eval 'as_val=${'$as_ac_var'} | 16686 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 16585 | $as_echo "$as_val"'` = yes; then | 16687 | $as_echo "$as_val"'` |
| 16688 | if test "x$as_val" = x""yes; then | ||
| 16586 | 16689 | ||
| 16587 | cat >>confdefs.h <<_ACEOF | 16690 | cat >>confdefs.h <<_ACEOF |
| 16588 | #define CRAY_STACKSEG_END $ac_func | 16691 | #define CRAY_STACKSEG_END $ac_func |
| @@ -16751,7 +16854,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 16751 | fi | 16854 | fi |
| 16752 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 | 16855 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 |
| 16753 | $as_echo "$ac_cv_lib_m_sqrt" >&6; } | 16856 | $as_echo "$ac_cv_lib_m_sqrt" >&6; } |
| 16754 | if test $ac_cv_lib_m_sqrt = yes; then | 16857 | if test "x$ac_cv_lib_m_sqrt" = x""yes; then |
| 16755 | cat >>confdefs.h <<_ACEOF | 16858 | cat >>confdefs.h <<_ACEOF |
| 16756 | #define HAVE_LIBM 1 | 16859 | #define HAVE_LIBM 1 |
| 16757 | _ACEOF | 16860 | _ACEOF |
| @@ -16828,7 +16931,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 16828 | fi | 16931 | fi |
| 16829 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5 | 16932 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5 |
| 16830 | $as_echo "$ac_cv_lib_mail_maillock" >&6; } | 16933 | $as_echo "$ac_cv_lib_mail_maillock" >&6; } |
| 16831 | if test $ac_cv_lib_mail_maillock = yes; then | 16934 | if test "x$ac_cv_lib_mail_maillock" = x""yes; then |
| 16832 | have_mail=yes | 16935 | have_mail=yes |
| 16833 | else | 16936 | else |
| 16834 | have_mail=no | 16937 | have_mail=no |
| @@ -16910,7 +17013,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 16910 | fi | 17013 | fi |
| 16911 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5 | 17014 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5 |
| 16912 | $as_echo "$ac_cv_lib_lockfile_maillock" >&6; } | 17015 | $as_echo "$ac_cv_lib_lockfile_maillock" >&6; } |
| 16913 | if test $ac_cv_lib_lockfile_maillock = yes; then | 17016 | if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then |
| 16914 | have_lockfile=yes | 17017 | have_lockfile=yes |
| 16915 | else | 17018 | else |
| 16916 | have_lockfile=no | 17019 | have_lockfile=no |
| @@ -17068,8 +17171,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 17068 | $as_echo "$as_val"'` | 17171 | $as_echo "$as_val"'` |
| 17069 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 17172 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 17070 | $as_echo "$ac_res" >&6; } | 17173 | $as_echo "$ac_res" >&6; } |
| 17071 | if test `eval 'as_val=${'$as_ac_var'} | 17174 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 17072 | $as_echo "$as_val"'` = yes; then | 17175 | $as_echo "$as_val"'` |
| 17176 | if test "x$as_val" = x""yes; then | ||
| 17073 | cat >>confdefs.h <<_ACEOF | 17177 | cat >>confdefs.h <<_ACEOF |
| 17074 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 17178 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 17075 | _ACEOF | 17179 | _ACEOF |
| @@ -17212,8 +17316,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 17212 | $as_echo "$ac_res" >&6; } | 17316 | $as_echo "$ac_res" >&6; } |
| 17213 | 17317 | ||
| 17214 | fi | 17318 | fi |
| 17215 | if test `eval 'as_val=${'$as_ac_Header'} | 17319 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 17216 | $as_echo "$as_val"'` = yes; then | 17320 | $as_echo "$as_val"'` |
| 17321 | if test "x$as_val" = x""yes; then | ||
| 17217 | cat >>confdefs.h <<_ACEOF | 17322 | cat >>confdefs.h <<_ACEOF |
| 17218 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 17323 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 17219 | _ACEOF | 17324 | _ACEOF |
| @@ -17394,8 +17499,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 17394 | $as_echo "$as_val"'` | 17499 | $as_echo "$as_val"'` |
| 17395 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 17500 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 17396 | $as_echo "$ac_res" >&6; } | 17501 | $as_echo "$ac_res" >&6; } |
| 17397 | if test `eval 'as_val=${'$as_ac_var'} | 17502 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 17398 | $as_echo "$as_val"'` = yes; then | 17503 | $as_echo "$as_val"'` |
| 17504 | if test "x$as_val" = x""yes; then | ||
| 17399 | cat >>confdefs.h <<_ACEOF | 17505 | cat >>confdefs.h <<_ACEOF |
| 17400 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 17506 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 17401 | _ACEOF | 17507 | _ACEOF |
| @@ -17539,8 +17645,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 17539 | $as_echo "$ac_res" >&6; } | 17645 | $as_echo "$ac_res" >&6; } |
| 17540 | 17646 | ||
| 17541 | fi | 17647 | fi |
| 17542 | if test `eval 'as_val=${'$as_ac_Header'} | 17648 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 17543 | $as_echo "$as_val"'` = yes; then | 17649 | $as_echo "$as_val"'` |
| 17650 | if test "x$as_val" = x""yes; then | ||
| 17544 | cat >>confdefs.h <<_ACEOF | 17651 | cat >>confdefs.h <<_ACEOF |
| 17545 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 17652 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 17546 | _ACEOF | 17653 | _ACEOF |
| @@ -17688,8 +17795,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 17688 | $as_echo "$ac_res" >&6; } | 17795 | $as_echo "$ac_res" >&6; } |
| 17689 | 17796 | ||
| 17690 | fi | 17797 | fi |
| 17691 | if test `eval 'as_val=${'$as_ac_Header'} | 17798 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 17692 | $as_echo "$as_val"'` = yes; then | 17799 | $as_echo "$as_val"'` |
| 17800 | if test "x$as_val" = x""yes; then | ||
| 17693 | cat >>confdefs.h <<_ACEOF | 17801 | cat >>confdefs.h <<_ACEOF |
| 17694 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 17802 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 17695 | _ACEOF | 17803 | _ACEOF |
| @@ -17796,8 +17904,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 17796 | $as_echo "$as_val"'` | 17904 | $as_echo "$as_val"'` |
| 17797 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 17905 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 17798 | $as_echo "$ac_res" >&6; } | 17906 | $as_echo "$ac_res" >&6; } |
| 17799 | if test `eval 'as_val=${'$as_ac_var'} | 17907 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 17800 | $as_echo "$as_val"'` = yes; then | 17908 | $as_echo "$as_val"'` |
| 17909 | if test "x$as_val" = x""yes; then | ||
| 17801 | cat >>confdefs.h <<_ACEOF | 17910 | cat >>confdefs.h <<_ACEOF |
| 17802 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 17911 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 17803 | _ACEOF | 17912 | _ACEOF |
| @@ -18182,7 +18291,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 18182 | fi | 18291 | fi |
| 18183 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5 | 18292 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5 |
| 18184 | $as_echo "$ac_cv_func_getloadavg" >&6; } | 18293 | $as_echo "$ac_cv_func_getloadavg" >&6; } |
| 18185 | if test $ac_cv_func_getloadavg = yes; then | 18294 | if test "x$ac_cv_func_getloadavg" = x""yes; then |
| 18186 | exit 0 | 18295 | exit 0 |
| 18187 | else | 18296 | else |
| 18188 | exit 1 | 18297 | exit 1 |
| @@ -18281,8 +18390,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 18281 | $as_echo "$as_val"'` | 18390 | $as_echo "$as_val"'` |
| 18282 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 18391 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 18283 | $as_echo "$ac_res" >&6; } | 18392 | $as_echo "$ac_res" >&6; } |
| 18284 | if test `eval 'as_val=${'$as_ac_var'} | 18393 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 18285 | $as_echo "$as_val"'` = yes; then | 18394 | $as_echo "$as_val"'` |
| 18395 | if test "x$as_val" = x""yes; then | ||
| 18286 | cat >>confdefs.h <<_ACEOF | 18396 | cat >>confdefs.h <<_ACEOF |
| 18287 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 18397 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 18288 | _ACEOF | 18398 | _ACEOF |
| @@ -18358,7 +18468,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18358 | fi | 18468 | fi |
| 18359 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 | 18469 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 |
| 18360 | $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } | 18470 | $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } |
| 18361 | if test $ac_cv_lib_kstat_kstat_open = yes; then | 18471 | if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then |
| 18362 | cat >>confdefs.h <<_ACEOF | 18472 | cat >>confdefs.h <<_ACEOF |
| 18363 | #define HAVE_LIBKSTAT 1 | 18473 | #define HAVE_LIBKSTAT 1 |
| 18364 | _ACEOF | 18474 | _ACEOF |
| @@ -18439,7 +18549,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18439 | fi | 18549 | fi |
| 18440 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 | 18550 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 |
| 18441 | $as_echo "$ac_cv_lib_elf_elf_begin" >&6; } | 18551 | $as_echo "$ac_cv_lib_elf_elf_begin" >&6; } |
| 18442 | if test $ac_cv_lib_elf_elf_begin = yes; then | 18552 | if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then |
| 18443 | LIBS="-lelf $LIBS" | 18553 | LIBS="-lelf $LIBS" |
| 18444 | fi | 18554 | fi |
| 18445 | 18555 | ||
| @@ -18510,7 +18620,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18510 | fi | 18620 | fi |
| 18511 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 | 18621 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 |
| 18512 | $as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } | 18622 | $as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } |
| 18513 | if test $ac_cv_lib_kvm_kvm_open = yes; then | 18623 | if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then |
| 18514 | LIBS="-lkvm $LIBS" | 18624 | LIBS="-lkvm $LIBS" |
| 18515 | fi | 18625 | fi |
| 18516 | 18626 | ||
| @@ -18580,7 +18690,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18580 | fi | 18690 | fi |
| 18581 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5 | 18691 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5 |
| 18582 | $as_echo "$ac_cv_lib_util_getloadavg" >&6; } | 18692 | $as_echo "$ac_cv_lib_util_getloadavg" >&6; } |
| 18583 | if test $ac_cv_lib_util_getloadavg = yes; then | 18693 | if test "x$ac_cv_lib_util_getloadavg" = x""yes; then |
| 18584 | LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes | 18694 | LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes |
| 18585 | fi | 18695 | fi |
| 18586 | 18696 | ||
| @@ -18656,7 +18766,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18656 | fi | 18766 | fi |
| 18657 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5 | 18767 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5 |
| 18658 | $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } | 18768 | $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } |
| 18659 | if test $ac_cv_lib_getloadavg_getloadavg = yes; then | 18769 | if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then |
| 18660 | LIBS="-lgetloadavg $LIBS" | 18770 | LIBS="-lgetloadavg $LIBS" |
| 18661 | else | 18771 | else |
| 18662 | LIBS=$ac_getloadavg_LIBS | 18772 | LIBS=$ac_getloadavg_LIBS |
| @@ -18757,8 +18867,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 18757 | $as_echo "$as_val"'` | 18867 | $as_echo "$as_val"'` |
| 18758 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 18868 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 18759 | $as_echo "$ac_res" >&6; } | 18869 | $as_echo "$ac_res" >&6; } |
| 18760 | if test `eval 'as_val=${'$as_ac_var'} | 18870 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 18761 | $as_echo "$as_val"'` = yes; then | 18871 | $as_echo "$as_val"'` |
| 18872 | if test "x$as_val" = x""yes; then | ||
| 18762 | cat >>confdefs.h <<_ACEOF | 18873 | cat >>confdefs.h <<_ACEOF |
| 18763 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 18874 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 18764 | _ACEOF | 18875 | _ACEOF |
| @@ -18904,7 +19015,7 @@ fi | |||
| 18904 | $as_echo "$ac_cv_header_sys_dg_sys_info_h" >&6; } | 19015 | $as_echo "$ac_cv_header_sys_dg_sys_info_h" >&6; } |
| 18905 | 19016 | ||
| 18906 | fi | 19017 | fi |
| 18907 | if test $ac_cv_header_sys_dg_sys_info_h = yes; then | 19018 | if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then |
| 18908 | ac_have_func=yes | 19019 | ac_have_func=yes |
| 18909 | 19020 | ||
| 18910 | cat >>confdefs.h <<\_ACEOF | 19021 | cat >>confdefs.h <<\_ACEOF |
| @@ -18977,7 +19088,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 18977 | fi | 19088 | fi |
| 18978 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5 | 19089 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5 |
| 18979 | $as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } | 19090 | $as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } |
| 18980 | if test $ac_cv_lib_dgc_dg_sys_info = yes; then | 19091 | if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then |
| 18981 | cat >>confdefs.h <<_ACEOF | 19092 | cat >>confdefs.h <<_ACEOF |
| 18982 | #define HAVE_LIBDGC 1 | 19093 | #define HAVE_LIBDGC 1 |
| 18983 | _ACEOF | 19094 | _ACEOF |
| @@ -19210,8 +19321,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 19210 | $as_echo "$as_val"'` | 19321 | $as_echo "$as_val"'` |
| 19211 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 19322 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 19212 | $as_echo "$ac_res" >&6; } | 19323 | $as_echo "$ac_res" >&6; } |
| 19213 | if test `eval 'as_val=${'$as_ac_var'} | 19324 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 19214 | $as_echo "$as_val"'` = yes; then | 19325 | $as_echo "$as_val"'` |
| 19326 | if test "x$as_val" = x""yes; then | ||
| 19215 | cat >>confdefs.h <<_ACEOF | 19327 | cat >>confdefs.h <<_ACEOF |
| 19216 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 19328 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 19217 | _ACEOF | 19329 | _ACEOF |
| @@ -19360,7 +19472,7 @@ fi | |||
| 19360 | $as_echo "$ac_cv_header_inq_stats_cpustats_h" >&6; } | 19472 | $as_echo "$ac_cv_header_inq_stats_cpustats_h" >&6; } |
| 19361 | 19473 | ||
| 19362 | fi | 19474 | fi |
| 19363 | if test $ac_cv_header_inq_stats_cpustats_h = yes; then | 19475 | if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then |
| 19364 | ac_have_func=yes | 19476 | ac_have_func=yes |
| 19365 | 19477 | ||
| 19366 | cat >>confdefs.h <<\_ACEOF | 19478 | cat >>confdefs.h <<\_ACEOF |
| @@ -19505,7 +19617,7 @@ fi | |||
| 19505 | $as_echo "$ac_cv_header_sys_cpustats_h" >&6; } | 19617 | $as_echo "$ac_cv_header_sys_cpustats_h" >&6; } |
| 19506 | 19618 | ||
| 19507 | fi | 19619 | fi |
| 19508 | if test $ac_cv_header_sys_cpustats_h = yes; then | 19620 | if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then |
| 19509 | ac_have_func=yes; cat >>confdefs.h <<\_ACEOF | 19621 | ac_have_func=yes; cat >>confdefs.h <<\_ACEOF |
| 19510 | #define UMAX 1 | 19622 | #define UMAX 1 |
| 19511 | _ACEOF | 19623 | _ACEOF |
| @@ -19651,8 +19763,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 19651 | $as_echo "$ac_res" >&6; } | 19763 | $as_echo "$ac_res" >&6; } |
| 19652 | 19764 | ||
| 19653 | fi | 19765 | fi |
| 19654 | if test `eval 'as_val=${'$as_ac_Header'} | 19766 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 19655 | $as_echo "$as_val"'` = yes; then | 19767 | $as_echo "$as_val"'` |
| 19768 | if test "x$as_val" = x""yes; then | ||
| 19656 | cat >>confdefs.h <<_ACEOF | 19769 | cat >>confdefs.h <<_ACEOF |
| 19657 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 19770 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 19658 | _ACEOF | 19771 | _ACEOF |
| @@ -19798,8 +19911,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 19798 | $as_echo "$ac_res" >&6; } | 19911 | $as_echo "$ac_res" >&6; } |
| 19799 | 19912 | ||
| 19800 | fi | 19913 | fi |
| 19801 | if test `eval 'as_val=${'$as_ac_Header'} | 19914 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 19802 | $as_echo "$as_val"'` = yes; then | 19915 | $as_echo "$as_val"'` |
| 19916 | if test "x$as_val" = x""yes; then | ||
| 19803 | cat >>confdefs.h <<_ACEOF | 19917 | cat >>confdefs.h <<_ACEOF |
| 19804 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 19918 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 19805 | _ACEOF | 19919 | _ACEOF |
| @@ -19900,7 +20014,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 19900 | fi | 20014 | fi |
| 19901 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5 | 20015 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5 |
| 19902 | $as_echo "$ac_cv_member_struct_nlist_n_un_n_name" >&6; } | 20016 | $as_echo "$ac_cv_member_struct_nlist_n_un_n_name" >&6; } |
| 19903 | if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then | 20017 | if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then |
| 19904 | 20018 | ||
| 19905 | cat >>confdefs.h <<_ACEOF | 20019 | cat >>confdefs.h <<_ACEOF |
| 19906 | #define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 | 20020 | #define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 |
| @@ -20281,8 +20395,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 20281 | $as_echo "$ac_res" >&6; } | 20395 | $as_echo "$ac_res" >&6; } |
| 20282 | 20396 | ||
| 20283 | fi | 20397 | fi |
| 20284 | if test `eval 'as_val=${'$as_ac_Header'} | 20398 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 20285 | $as_echo "$as_val"'` = yes; then | 20399 | $as_echo "$as_val"'` |
| 20400 | if test "x$as_val" = x""yes; then | ||
| 20286 | cat >>confdefs.h <<_ACEOF | 20401 | cat >>confdefs.h <<_ACEOF |
| 20287 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 20402 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 20288 | _ACEOF | 20403 | _ACEOF |
| @@ -20385,8 +20500,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 20385 | $as_echo "$as_val"'` | 20500 | $as_echo "$as_val"'` |
| 20386 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 20501 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 20387 | $as_echo "$ac_res" >&6; } | 20502 | $as_echo "$ac_res" >&6; } |
| 20388 | if test `eval 'as_val=${'$as_ac_var'} | 20503 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 20389 | $as_echo "$as_val"'` = yes; then | 20504 | $as_echo "$as_val"'` |
| 20505 | if test "x$as_val" = x""yes; then | ||
| 20390 | cat >>confdefs.h <<_ACEOF | 20506 | cat >>confdefs.h <<_ACEOF |
| 20391 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 20507 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 20392 | _ACEOF | 20508 | _ACEOF |
| @@ -20453,7 +20569,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 20453 | fi | 20569 | fi |
| 20454 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 | 20570 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 |
| 20455 | $as_echo "$ac_cv_have_decl_optreset" >&6; } | 20571 | $as_echo "$ac_cv_have_decl_optreset" >&6; } |
| 20456 | if test $ac_cv_have_decl_optreset = yes; then | 20572 | if test "x$ac_cv_have_decl_optreset" = x""yes; then |
| 20457 | GETOPT_H=getopt.h | 20573 | GETOPT_H=getopt.h |
| 20458 | fi | 20574 | fi |
| 20459 | 20575 | ||
| @@ -20520,7 +20636,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 20520 | fi | 20636 | fi |
| 20521 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5 | 20637 | { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5 |
| 20522 | $as_echo "$ac_cv_have_decl_getopt_clip" >&6; } | 20638 | $as_echo "$ac_cv_have_decl_getopt_clip" >&6; } |
| 20523 | if test $ac_cv_have_decl_getopt_clip = yes; then | 20639 | if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then |
| 20524 | gl_cv_func_gnu_getopt=no | 20640 | gl_cv_func_gnu_getopt=no |
| 20525 | else | 20641 | else |
| 20526 | gl_cv_func_gnu_getopt=yes | 20642 | gl_cv_func_gnu_getopt=yes |
| @@ -20765,8 +20881,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 20765 | $as_echo "$as_val"'` | 20881 | $as_echo "$as_val"'` |
| 20766 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 20882 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 20767 | $as_echo "$ac_res" >&6; } | 20883 | $as_echo "$ac_res" >&6; } |
| 20768 | if test `eval 'as_val=${'$as_ac_var'} | 20884 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 20769 | $as_echo "$as_val"'` = yes; then | 20885 | $as_echo "$as_val"'` |
| 20886 | if test "x$as_val" = x""yes; then | ||
| 20770 | cat >>confdefs.h <<_ACEOF | 20887 | cat >>confdefs.h <<_ACEOF |
| 20771 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 20888 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 20772 | _ACEOF | 20889 | _ACEOF |
| @@ -20838,7 +20955,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 20838 | fi | 20955 | fi |
| 20839 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 | 20956 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 |
| 20840 | $as_echo "$ac_cv_lib_intl_strftime" >&6; } | 20957 | $as_echo "$ac_cv_lib_intl_strftime" >&6; } |
| 20841 | if test $ac_cv_lib_intl_strftime = yes; then | 20958 | if test "x$ac_cv_lib_intl_strftime" = x""yes; then |
| 20842 | cat >>confdefs.h <<\_ACEOF | 20959 | cat >>confdefs.h <<\_ACEOF |
| 20843 | #define HAVE_STRFTIME 1 | 20960 | #define HAVE_STRFTIME 1 |
| 20844 | _ACEOF | 20961 | _ACEOF |
| @@ -20942,8 +21059,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 20942 | $as_echo "$as_val"'` | 21059 | $as_echo "$as_val"'` |
| 20943 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 21060 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 20944 | $as_echo "$ac_res" >&6; } | 21061 | $as_echo "$ac_res" >&6; } |
| 20945 | if test `eval 'as_val=${'$as_ac_var'} | 21062 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 20946 | $as_echo "$as_val"'` = yes; then | 21063 | $as_echo "$as_val"'` |
| 21064 | if test "x$as_val" = x""yes; then | ||
| 20947 | cat >>confdefs.h <<_ACEOF | 21065 | cat >>confdefs.h <<_ACEOF |
| 20948 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21066 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 20949 | _ACEOF | 21067 | _ACEOF |
| @@ -21044,8 +21162,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 21044 | $as_echo "$as_val"'` | 21162 | $as_echo "$as_val"'` |
| 21045 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 21163 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 21046 | $as_echo "$ac_res" >&6; } | 21164 | $as_echo "$ac_res" >&6; } |
| 21047 | if test `eval 'as_val=${'$as_ac_var'} | 21165 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 21048 | $as_echo "$as_val"'` = yes; then | 21166 | $as_echo "$as_val"'` |
| 21167 | if test "x$as_val" = x""yes; then | ||
| 21049 | cat >>confdefs.h <<_ACEOF | 21168 | cat >>confdefs.h <<_ACEOF |
| 21050 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 21169 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 21051 | _ACEOF | 21170 | _ACEOF |
| @@ -21159,6 +21278,7 @@ libncurses-dev(el), libterminfo-dev(el) or similar." >&2;} | |||
| 21159 | { (exit 1); exit 1; }; } | 21278 | { (exit 1); exit 1; }; } |
| 21160 | fi | 21279 | fi |
| 21161 | # Must define this when any termcap library is found. | 21280 | # Must define this when any termcap library is found. |
| 21281 | |||
| 21162 | cat >>confdefs.h <<\_ACEOF | 21282 | cat >>confdefs.h <<\_ACEOF |
| 21163 | #define HAVE_LIBNCURSES 1 | 21283 | #define HAVE_LIBNCURSES 1 |
| 21164 | _ACEOF | 21284 | _ACEOF |
| @@ -21375,7 +21495,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 21375 | fi | 21495 | fi |
| 21376 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 | 21496 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 |
| 21377 | $as_echo "$ac_cv_func_res_send" >&6; } | 21497 | $as_echo "$ac_cv_func_res_send" >&6; } |
| 21378 | if test $ac_cv_func_res_send = yes; then | 21498 | if test "x$ac_cv_func_res_send" = x""yes; then |
| 21379 | : | 21499 | : |
| 21380 | else | 21500 | else |
| 21381 | { $as_echo "$as_me:$LINENO: checking for __res_send" >&5 | 21501 | { $as_echo "$as_me:$LINENO: checking for __res_send" >&5 |
| @@ -21463,7 +21583,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 21463 | fi | 21583 | fi |
| 21464 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5 | 21584 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5 |
| 21465 | $as_echo "$ac_cv_func___res_send" >&6; } | 21585 | $as_echo "$ac_cv_func___res_send" >&6; } |
| 21466 | if test $ac_cv_func___res_send = yes; then | 21586 | if test "x$ac_cv_func___res_send" = x""yes; then |
| 21467 | : | 21587 | : |
| 21468 | else | 21588 | else |
| 21469 | { $as_echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 | 21589 | { $as_echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 |
| @@ -21531,7 +21651,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 21531 | fi | 21651 | fi |
| 21532 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 | 21652 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 |
| 21533 | $as_echo "$ac_cv_lib_resolv_res_send" >&6; } | 21653 | $as_echo "$ac_cv_lib_resolv_res_send" >&6; } |
| 21534 | if test $ac_cv_lib_resolv_res_send = yes; then | 21654 | if test "x$ac_cv_lib_resolv_res_send" = x""yes; then |
| 21535 | resolv=yes | 21655 | resolv=yes |
| 21536 | else | 21656 | else |
| 21537 | { $as_echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 | 21657 | { $as_echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 |
| @@ -21599,7 +21719,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 21599 | fi | 21719 | fi |
| 21600 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 | 21720 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 |
| 21601 | $as_echo "$ac_cv_lib_resolv___res_send" >&6; } | 21721 | $as_echo "$ac_cv_lib_resolv___res_send" >&6; } |
| 21602 | if test $ac_cv_lib_resolv___res_send = yes; then | 21722 | if test "x$ac_cv_lib_resolv___res_send" = x""yes; then |
| 21603 | resolv=yes | 21723 | resolv=yes |
| 21604 | fi | 21724 | fi |
| 21605 | 21725 | ||
| @@ -21699,7 +21819,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 21699 | fi | 21819 | fi |
| 21700 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5 | 21820 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5 |
| 21701 | $as_echo "$ac_cv_func_hes_getmailhost" >&6; } | 21821 | $as_echo "$ac_cv_func_hes_getmailhost" >&6; } |
| 21702 | if test $ac_cv_func_hes_getmailhost = yes; then | 21822 | if test "x$ac_cv_func_hes_getmailhost" = x""yes; then |
| 21703 | : | 21823 | : |
| 21704 | else | 21824 | else |
| 21705 | { $as_echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5 | 21825 | { $as_echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5 |
| @@ -21767,7 +21887,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 21767 | fi | 21887 | fi |
| 21768 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 | 21888 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 |
| 21769 | $as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } | 21889 | $as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } |
| 21770 | if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then | 21890 | if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then |
| 21771 | hesiod=yes | 21891 | hesiod=yes |
| 21772 | else | 21892 | else |
| 21773 | : | 21893 | : |
| @@ -21873,7 +21993,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 21873 | fi | 21993 | fi |
| 21874 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 | 21994 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 |
| 21875 | $as_echo "$ac_cv_lib_com_err_com_err" >&6; } | 21995 | $as_echo "$ac_cv_lib_com_err_com_err" >&6; } |
| 21876 | if test $ac_cv_lib_com_err_com_err = yes; then | 21996 | if test "x$ac_cv_lib_com_err_com_err" = x""yes; then |
| 21877 | have_com_err=yes | 21997 | have_com_err=yes |
| 21878 | else | 21998 | else |
| 21879 | have_com_err=no | 21999 | have_com_err=no |
| @@ -21953,7 +22073,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 21953 | fi | 22073 | fi |
| 21954 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 | 22074 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 |
| 21955 | $as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } | 22075 | $as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } |
| 21956 | if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then | 22076 | if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then |
| 21957 | have_crypto=yes | 22077 | have_crypto=yes |
| 21958 | else | 22078 | else |
| 21959 | have_crypto=no | 22079 | have_crypto=no |
| @@ -22033,7 +22153,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22033 | fi | 22153 | fi |
| 22034 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 | 22154 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 |
| 22035 | $as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } | 22155 | $as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } |
| 22036 | if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then | 22156 | if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then |
| 22037 | have_k5crypto=yes | 22157 | have_k5crypto=yes |
| 22038 | else | 22158 | else |
| 22039 | have_k5crypto=no | 22159 | have_k5crypto=no |
| @@ -22113,7 +22233,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22113 | fi | 22233 | fi |
| 22114 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 | 22234 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 |
| 22115 | $as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } | 22235 | $as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } |
| 22116 | if test $ac_cv_lib_krb5_krb5_init_context = yes; then | 22236 | if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then |
| 22117 | have_krb5=yes | 22237 | have_krb5=yes |
| 22118 | else | 22238 | else |
| 22119 | have_krb5=no | 22239 | have_krb5=no |
| @@ -22194,7 +22314,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22194 | fi | 22314 | fi |
| 22195 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 | 22315 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 |
| 22196 | $as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } | 22316 | $as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } |
| 22197 | if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then | 22317 | if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then |
| 22198 | have_des425=yes | 22318 | have_des425=yes |
| 22199 | else | 22319 | else |
| 22200 | have_des425=no | 22320 | have_des425=no |
| @@ -22274,7 +22394,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22274 | fi | 22394 | fi |
| 22275 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 | 22395 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 |
| 22276 | $as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } | 22396 | $as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } |
| 22277 | if test $ac_cv_lib_des_des_cbc_encrypt = yes; then | 22397 | if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then |
| 22278 | have_des=yes | 22398 | have_des=yes |
| 22279 | else | 22399 | else |
| 22280 | have_des=no | 22400 | have_des=no |
| @@ -22355,7 +22475,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22355 | fi | 22475 | fi |
| 22356 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5 | 22476 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5 |
| 22357 | $as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } | 22477 | $as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } |
| 22358 | if test $ac_cv_lib_krb4_krb_get_cred = yes; then | 22478 | if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then |
| 22359 | have_krb4=yes | 22479 | have_krb4=yes |
| 22360 | else | 22480 | else |
| 22361 | have_krb4=no | 22481 | have_krb4=no |
| @@ -22435,7 +22555,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 22435 | fi | 22555 | fi |
| 22436 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5 | 22556 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5 |
| 22437 | $as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } | 22557 | $as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } |
| 22438 | if test $ac_cv_lib_krb_krb_get_cred = yes; then | 22558 | if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then |
| 22439 | have_krb=yes | 22559 | have_krb=yes |
| 22440 | else | 22560 | else |
| 22441 | have_krb=no | 22561 | have_krb=no |
| @@ -22589,8 +22709,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 22589 | $as_echo "$ac_res" >&6; } | 22709 | $as_echo "$ac_res" >&6; } |
| 22590 | 22710 | ||
| 22591 | fi | 22711 | fi |
| 22592 | if test `eval 'as_val=${'$as_ac_Header'} | 22712 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 22593 | $as_echo "$as_val"'` = yes; then | 22713 | $as_echo "$as_val"'` |
| 22714 | if test "x$as_val" = x""yes; then | ||
| 22594 | cat >>confdefs.h <<_ACEOF | 22715 | cat >>confdefs.h <<_ACEOF |
| 22595 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 22716 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 22596 | _ACEOF | 22717 | _ACEOF |
| @@ -22691,7 +22812,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 22691 | fi | 22812 | fi |
| 22692 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text" >&5 | 22813 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text" >&5 |
| 22693 | $as_echo "$ac_cv_member_krb5_error_text" >&6; } | 22814 | $as_echo "$ac_cv_member_krb5_error_text" >&6; } |
| 22694 | if test $ac_cv_member_krb5_error_text = yes; then | 22815 | if test "x$ac_cv_member_krb5_error_text" = x""yes; then |
| 22695 | 22816 | ||
| 22696 | cat >>confdefs.h <<_ACEOF | 22817 | cat >>confdefs.h <<_ACEOF |
| 22697 | #define HAVE_KRB5_ERROR_TEXT 1 | 22818 | #define HAVE_KRB5_ERROR_TEXT 1 |
| @@ -22796,7 +22917,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 22796 | fi | 22917 | fi |
| 22797 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_text" >&5 | 22918 | { $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_text" >&5 |
| 22798 | $as_echo "$ac_cv_member_krb5_error_e_text" >&6; } | 22919 | $as_echo "$ac_cv_member_krb5_error_e_text" >&6; } |
| 22799 | if test $ac_cv_member_krb5_error_e_text = yes; then | 22920 | if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then |
| 22800 | 22921 | ||
| 22801 | cat >>confdefs.h <<_ACEOF | 22922 | cat >>confdefs.h <<_ACEOF |
| 22802 | #define HAVE_KRB5_ERROR_E_TEXT 1 | 22923 | #define HAVE_KRB5_ERROR_E_TEXT 1 |
| @@ -22945,8 +23066,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 22945 | $as_echo "$ac_res" >&6; } | 23066 | $as_echo "$ac_res" >&6; } |
| 22946 | 23067 | ||
| 22947 | fi | 23068 | fi |
| 22948 | if test `eval 'as_val=${'$as_ac_Header'} | 23069 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 22949 | $as_echo "$as_val"'` = yes; then | 23070 | $as_echo "$as_val"'` |
| 23071 | if test "x$as_val" = x""yes; then | ||
| 22950 | cat >>confdefs.h <<_ACEOF | 23072 | cat >>confdefs.h <<_ACEOF |
| 22951 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23073 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 22952 | _ACEOF | 23074 | _ACEOF |
| @@ -23087,8 +23209,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23087 | $as_echo "$ac_res" >&6; } | 23209 | $as_echo "$ac_res" >&6; } |
| 23088 | 23210 | ||
| 23089 | fi | 23211 | fi |
| 23090 | if test `eval 'as_val=${'$as_ac_Header'} | 23212 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23091 | $as_echo "$as_val"'` = yes; then | 23213 | $as_echo "$as_val"'` |
| 23214 | if test "x$as_val" = x""yes; then | ||
| 23092 | cat >>confdefs.h <<_ACEOF | 23215 | cat >>confdefs.h <<_ACEOF |
| 23093 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23216 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23094 | _ACEOF | 23217 | _ACEOF |
| @@ -23229,8 +23352,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23229 | $as_echo "$ac_res" >&6; } | 23352 | $as_echo "$ac_res" >&6; } |
| 23230 | 23353 | ||
| 23231 | fi | 23354 | fi |
| 23232 | if test `eval 'as_val=${'$as_ac_Header'} | 23355 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23233 | $as_echo "$as_val"'` = yes; then | 23356 | $as_echo "$as_val"'` |
| 23357 | if test "x$as_val" = x""yes; then | ||
| 23234 | cat >>confdefs.h <<_ACEOF | 23358 | cat >>confdefs.h <<_ACEOF |
| 23235 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23359 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23236 | _ACEOF | 23360 | _ACEOF |
| @@ -23382,8 +23506,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23382 | $as_echo "$ac_res" >&6; } | 23506 | $as_echo "$ac_res" >&6; } |
| 23383 | 23507 | ||
| 23384 | fi | 23508 | fi |
| 23385 | if test `eval 'as_val=${'$as_ac_Header'} | 23509 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23386 | $as_echo "$as_val"'` = yes; then | 23510 | $as_echo "$as_val"'` |
| 23511 | if test "x$as_val" = x""yes; then | ||
| 23387 | cat >>confdefs.h <<_ACEOF | 23512 | cat >>confdefs.h <<_ACEOF |
| 23388 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23513 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23389 | _ACEOF | 23514 | _ACEOF |
| @@ -23524,8 +23649,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23524 | $as_echo "$ac_res" >&6; } | 23649 | $as_echo "$ac_res" >&6; } |
| 23525 | 23650 | ||
| 23526 | fi | 23651 | fi |
| 23527 | if test `eval 'as_val=${'$as_ac_Header'} | 23652 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23528 | $as_echo "$as_val"'` = yes; then | 23653 | $as_echo "$as_val"'` |
| 23654 | if test "x$as_val" = x""yes; then | ||
| 23529 | cat >>confdefs.h <<_ACEOF | 23655 | cat >>confdefs.h <<_ACEOF |
| 23530 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23656 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23531 | _ACEOF | 23657 | _ACEOF |
| @@ -23666,8 +23792,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23666 | $as_echo "$ac_res" >&6; } | 23792 | $as_echo "$ac_res" >&6; } |
| 23667 | 23793 | ||
| 23668 | fi | 23794 | fi |
| 23669 | if test `eval 'as_val=${'$as_ac_Header'} | 23795 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23670 | $as_echo "$as_val"'` = yes; then | 23796 | $as_echo "$as_val"'` |
| 23797 | if test "x$as_val" = x""yes; then | ||
| 23671 | cat >>confdefs.h <<_ACEOF | 23798 | cat >>confdefs.h <<_ACEOF |
| 23672 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23799 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23673 | _ACEOF | 23800 | _ACEOF |
| @@ -23820,8 +23947,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 23820 | $as_echo "$ac_res" >&6; } | 23947 | $as_echo "$ac_res" >&6; } |
| 23821 | 23948 | ||
| 23822 | fi | 23949 | fi |
| 23823 | if test `eval 'as_val=${'$as_ac_Header'} | 23950 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 23824 | $as_echo "$as_val"'` = yes; then | 23951 | $as_echo "$as_val"'` |
| 23952 | if test "x$as_val" = x""yes; then | ||
| 23825 | cat >>confdefs.h <<_ACEOF | 23953 | cat >>confdefs.h <<_ACEOF |
| 23826 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 23954 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 23827 | _ACEOF | 23955 | _ACEOF |
| @@ -23906,7 +24034,7 @@ LIBS=$ac_check_lib_save_LIBS | |||
| 23906 | fi | 24034 | fi |
| 23907 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 | 24035 | { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 |
| 23908 | $as_echo "$ac_cv_lib_intl_dgettext" >&6; } | 24036 | $as_echo "$ac_cv_lib_intl_dgettext" >&6; } |
| 23909 | if test $ac_cv_lib_intl_dgettext = yes; then | 24037 | if test "x$ac_cv_lib_intl_dgettext" = x""yes; then |
| 23910 | cat >>confdefs.h <<_ACEOF | 24038 | cat >>confdefs.h <<_ACEOF |
| 23911 | #define HAVE_LIBINTL 1 | 24039 | #define HAVE_LIBINTL 1 |
| 23912 | _ACEOF | 24040 | _ACEOF |
| @@ -24106,8 +24234,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 24106 | $as_echo "$as_val"'` | 24234 | $as_echo "$as_val"'` |
| 24107 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 24235 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 24108 | $as_echo "$ac_res" >&6; } | 24236 | $as_echo "$ac_res" >&6; } |
| 24109 | if test `eval 'as_val=${'$as_ac_var'} | 24237 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 24110 | $as_echo "$as_val"'` = yes; then | 24238 | $as_echo "$as_val"'` |
| 24239 | if test "x$as_val" = x""yes; then | ||
| 24111 | cat >>confdefs.h <<_ACEOF | 24240 | cat >>confdefs.h <<_ACEOF |
| 24112 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 24241 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 24113 | _ACEOF | 24242 | _ACEOF |
| @@ -24273,7 +24402,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |||
| 24273 | fi | 24402 | fi |
| 24274 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 | 24403 | { $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 |
| 24275 | $as_echo "$ac_cv_func_socket" >&6; } | 24404 | $as_echo "$ac_cv_func_socket" >&6; } |
| 24276 | if test $ac_cv_func_socket = yes; then | 24405 | if test "x$ac_cv_func_socket" = x""yes; then |
| 24277 | : | 24406 | : |
| 24278 | else | 24407 | else |
| 24279 | ok_so_far=no | 24408 | ok_so_far=no |
| @@ -24407,7 +24536,7 @@ fi | |||
| 24407 | $as_echo "$ac_cv_header_netinet_in_h" >&6; } | 24536 | $as_echo "$ac_cv_header_netinet_in_h" >&6; } |
| 24408 | 24537 | ||
| 24409 | fi | 24538 | fi |
| 24410 | if test $ac_cv_header_netinet_in_h = yes; then | 24539 | if test "x$ac_cv_header_netinet_in_h" = x""yes; then |
| 24411 | : | 24540 | : |
| 24412 | else | 24541 | else |
| 24413 | ok_so_far=no | 24542 | ok_so_far=no |
| @@ -24543,7 +24672,7 @@ fi | |||
| 24543 | $as_echo "$ac_cv_header_arpa_inet_h" >&6; } | 24672 | $as_echo "$ac_cv_header_arpa_inet_h" >&6; } |
| 24544 | 24673 | ||
| 24545 | fi | 24674 | fi |
| 24546 | if test $ac_cv_header_arpa_inet_h = yes; then | 24675 | if test "x$ac_cv_header_arpa_inet_h" = x""yes; then |
| 24547 | : | 24676 | : |
| 24548 | else | 24677 | else |
| 24549 | ok_so_far=no | 24678 | ok_so_far=no |
| @@ -24694,8 +24823,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 24694 | $as_echo "$ac_res" >&6; } | 24823 | $as_echo "$ac_res" >&6; } |
| 24695 | 24824 | ||
| 24696 | fi | 24825 | fi |
| 24697 | if test `eval 'as_val=${'$as_ac_Header'} | 24826 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 24698 | $as_echo "$as_val"'` = yes; then | 24827 | $as_echo "$as_val"'` |
| 24828 | if test "x$as_val" = x""yes; then | ||
| 24699 | cat >>confdefs.h <<_ACEOF | 24829 | cat >>confdefs.h <<_ACEOF |
| 24700 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 24830 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 24701 | _ACEOF | 24831 | _ACEOF |
| @@ -24822,7 +24952,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 24822 | fi | 24952 | fi |
| 24823 | { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 | 24953 | { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 |
| 24824 | $as_echo "$ac_cv_type_pid_t" >&6; } | 24954 | $as_echo "$ac_cv_type_pid_t" >&6; } |
| 24825 | if test $ac_cv_type_pid_t = yes; then | 24955 | if test "x$ac_cv_type_pid_t" = x""yes; then |
| 24826 | : | 24956 | : |
| 24827 | else | 24957 | else |
| 24828 | 24958 | ||
| @@ -24967,8 +25097,9 @@ ac_res=`eval 'as_val=${'$as_ac_Header'} | |||
| 24967 | $as_echo "$ac_res" >&6; } | 25097 | $as_echo "$ac_res" >&6; } |
| 24968 | 25098 | ||
| 24969 | fi | 25099 | fi |
| 24970 | if test `eval 'as_val=${'$as_ac_Header'} | 25100 | as_val=`eval 'as_val=${'$as_ac_Header'} |
| 24971 | $as_echo "$as_val"'` = yes; then | 25101 | $as_echo "$as_val"'` |
| 25102 | if test "x$as_val" = x""yes; then | ||
| 24972 | cat >>confdefs.h <<_ACEOF | 25103 | cat >>confdefs.h <<_ACEOF |
| 24973 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 25104 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 24974 | _ACEOF | 25105 | _ACEOF |
| @@ -25069,8 +25200,9 @@ ac_res=`eval 'as_val=${'$as_ac_var'} | |||
| 25069 | $as_echo "$as_val"'` | 25200 | $as_echo "$as_val"'` |
| 25070 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 | 25201 | { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 25071 | $as_echo "$ac_res" >&6; } | 25202 | $as_echo "$ac_res" >&6; } |
| 25072 | if test `eval 'as_val=${'$as_ac_var'} | 25203 | as_val=`eval 'as_val=${'$as_ac_var'} |
| 25073 | $as_echo "$as_val"'` = yes; then | 25204 | $as_echo "$as_val"'` |
| 25205 | if test "x$as_val" = x""yes; then | ||
| 25074 | cat >>confdefs.h <<_ACEOF | 25206 | cat >>confdefs.h <<_ACEOF |
| 25075 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 25207 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
| 25076 | _ACEOF | 25208 | _ACEOF |
| @@ -25494,7 +25626,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 25494 | fi | 25626 | fi |
| 25495 | { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | 25627 | { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 |
| 25496 | $as_echo "$ac_cv_type_size_t" >&6; } | 25628 | $as_echo "$ac_cv_type_size_t" >&6; } |
| 25497 | if test $ac_cv_type_size_t = yes; then | 25629 | if test "x$ac_cv_type_size_t" = x""yes; then |
| 25498 | 25630 | ||
| 25499 | cat >>confdefs.h <<_ACEOF | 25631 | cat >>confdefs.h <<_ACEOF |
| 25500 | #define HAVE_SIZE_T 1 | 25632 | #define HAVE_SIZE_T 1 |
| @@ -25936,6 +26068,7 @@ echo " Does Emacs use -ltiff? ${HAVE_TIFF}" | |||
| 25936 | echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF" | 26068 | echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF" |
| 25937 | echo " Does Emacs use -lpng? ${HAVE_PNG}" | 26069 | echo " Does Emacs use -lpng? ${HAVE_PNG}" |
| 25938 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" | 26070 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" |
| 26071 | echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}" | ||
| 25939 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" | 26072 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" |
| 25940 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | 26073 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" |
| 25941 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" | 26074 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" |
| @@ -26045,8 +26178,8 @@ _ACEOF | |||
| 26045 | case $ac_val in #( | 26178 | case $ac_val in #( |
| 26046 | *${as_nl}*) | 26179 | *${as_nl}*) |
| 26047 | case $ac_var in #( | 26180 | case $ac_var in #( |
| 26048 | *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | 26181 | *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 |
| 26049 | $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | 26182 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
| 26050 | esac | 26183 | esac |
| 26051 | case $ac_var in #( | 26184 | case $ac_var in #( |
| 26052 | _ | IFS | as_nl) ;; #( | 26185 | _ | IFS | as_nl) ;; #( |
| @@ -26438,7 +26571,7 @@ exec 6>&1 | |||
| 26438 | # values after options handling. | 26571 | # values after options handling. |
| 26439 | ac_log=" | 26572 | ac_log=" |
| 26440 | This file was extended by emacs $as_me 24.0.50, which was | 26573 | This file was extended by emacs $as_me 24.0.50, which was |
| 26441 | generated by GNU Autoconf 2.62. Invocation command line was | 26574 | generated by GNU Autoconf 2.63. Invocation command line was |
| 26442 | 26575 | ||
| 26443 | CONFIG_FILES = $CONFIG_FILES | 26576 | CONFIG_FILES = $CONFIG_FILES |
| 26444 | CONFIG_HEADERS = $CONFIG_HEADERS | 26577 | CONFIG_HEADERS = $CONFIG_HEADERS |
| @@ -26451,6 +26584,15 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` | |||
| 26451 | 26584 | ||
| 26452 | _ACEOF | 26585 | _ACEOF |
| 26453 | 26586 | ||
| 26587 | case $ac_config_files in *" | ||
| 26588 | "*) set x $ac_config_files; shift; ac_config_files=$*;; | ||
| 26589 | esac | ||
| 26590 | |||
| 26591 | case $ac_config_headers in *" | ||
| 26592 | "*) set x $ac_config_headers; shift; ac_config_headers=$*;; | ||
| 26593 | esac | ||
| 26594 | |||
| 26595 | |||
| 26454 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 26596 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 26455 | # Files that config.status was made for. | 26597 | # Files that config.status was made for. |
| 26456 | config_files="$ac_config_files" | 26598 | config_files="$ac_config_files" |
| @@ -26464,16 +26606,17 @@ ac_cs_usage="\ | |||
| 26464 | \`$as_me' instantiates files from templates according to the | 26606 | \`$as_me' instantiates files from templates according to the |
| 26465 | current configuration. | 26607 | current configuration. |
| 26466 | 26608 | ||
| 26467 | Usage: $0 [OPTIONS] [FILE]... | 26609 | Usage: $0 [OPTION]... [FILE]... |
| 26468 | 26610 | ||
| 26469 | -h, --help print this help, then exit | 26611 | -h, --help print this help, then exit |
| 26470 | -V, --version print version number and configuration settings, then exit | 26612 | -V, --version print version number and configuration settings, then exit |
| 26471 | -q, --quiet do not print progress messages | 26613 | -q, --quiet, --silent |
| 26614 | do not print progress messages | ||
| 26472 | -d, --debug don't remove temporary files | 26615 | -d, --debug don't remove temporary files |
| 26473 | --recheck update $as_me by reconfiguring in the same conditions | 26616 | --recheck update $as_me by reconfiguring in the same conditions |
| 26474 | --file=FILE[:TEMPLATE] | 26617 | --file=FILE[:TEMPLATE] |
| 26475 | instantiate the configuration file FILE | 26618 | instantiate the configuration file FILE |
| 26476 | --header=FILE[:TEMPLATE] | 26619 | --header=FILE[:TEMPLATE] |
| 26477 | instantiate the configuration header FILE | 26620 | instantiate the configuration header FILE |
| 26478 | 26621 | ||
| 26479 | Configuration files: | 26622 | Configuration files: |
| @@ -26491,7 +26634,7 @@ _ACEOF | |||
| 26491 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 26634 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 26492 | ac_cs_version="\\ | 26635 | ac_cs_version="\\ |
| 26493 | emacs config.status 24.0.50 | 26636 | emacs config.status 24.0.50 |
| 26494 | configured by $0, generated by GNU Autoconf 2.62, | 26637 | configured by $0, generated by GNU Autoconf 2.63, |
| 26495 | with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | 26638 | with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
| 26496 | 26639 | ||
| 26497 | Copyright (C) 2008 Free Software Foundation, Inc. | 26640 | Copyright (C) 2008 Free Software Foundation, Inc. |
| @@ -26705,7 +26848,8 @@ for ac_last_try in false false false false false :; do | |||
| 26705 | $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | 26848 | $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 26706 | { (exit 1); exit 1; }; } | 26849 | { (exit 1); exit 1; }; } |
| 26707 | 26850 | ||
| 26708 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then | 26851 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
| 26852 | if test $ac_delim_n = $ac_delim_num; then | ||
| 26709 | break | 26853 | break |
| 26710 | elif $ac_last_try; then | 26854 | elif $ac_last_try; then |
| 26711 | { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | 26855 | { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| @@ -26910,9 +27054,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
| 26910 | } | 27054 | } |
| 26911 | split(mac1, mac2, "(") #) | 27055 | split(mac1, mac2, "(") #) |
| 26912 | macro = mac2[1] | 27056 | macro = mac2[1] |
| 27057 | prefix = substr(line, 1, index(line, defundef) - 1) | ||
| 26913 | if (D_is_set[macro]) { | 27058 | if (D_is_set[macro]) { |
| 26914 | # Preserve the white space surrounding the "#". | 27059 | # Preserve the white space surrounding the "#". |
| 26915 | prefix = substr(line, 1, index(line, defundef) - 1) | ||
| 26916 | print prefix "define", macro P[macro] D[macro] | 27060 | print prefix "define", macro P[macro] D[macro] |
| 26917 | next | 27061 | next |
| 26918 | } else { | 27062 | } else { |
| @@ -26920,7 +27064,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
| 26920 | # in the case of _POSIX_SOURCE, which is predefined and required | 27064 | # in the case of _POSIX_SOURCE, which is predefined and required |
| 26921 | # on some systems where configure will not decide to define it. | 27065 | # on some systems where configure will not decide to define it. |
| 26922 | if (defundef == "undef") { | 27066 | if (defundef == "undef") { |
| 26923 | print "/*", line, "*/" | 27067 | print "/*", prefix defundef, macro, "*/" |
| 26924 | next | 27068 | next |
| 26925 | } | 27069 | } |
| 26926 | } | 27070 | } |
| @@ -26944,8 +27088,8 @@ do | |||
| 26944 | esac | 27088 | esac |
| 26945 | case $ac_mode$ac_tag in | 27089 | case $ac_mode$ac_tag in |
| 26946 | :[FHL]*:*);; | 27090 | :[FHL]*:*);; |
| 26947 | :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | 27091 | :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 |
| 26948 | $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} | 27092 | $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} |
| 26949 | { (exit 1); exit 1; }; };; | 27093 | { (exit 1); exit 1; }; };; |
| 26950 | :[FH]-) ac_tag=-:-;; | 27094 | :[FH]-) ac_tag=-:-;; |
| 26951 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | 27095 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
| @@ -27333,8 +27477,8 @@ if test "$no_create" != yes; then | |||
| 27333 | $ac_cs_success || { (exit 1); exit 1; } | 27477 | $ac_cs_success || { (exit 1); exit 1; } |
| 27334 | fi | 27478 | fi |
| 27335 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | 27479 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
| 27336 | { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 | 27480 | { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
| 27337 | $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} | 27481 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
| 27338 | fi | 27482 | fi |
| 27339 | 27483 | ||
| 27340 | 27484 | ||
diff --git a/configure.in b/configure.in index fc7c0a93235..eced710c1a7 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -148,6 +148,7 @@ OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image support]) | |||
| 148 | OPTION_DEFAULT_ON([gif],[don't compile with GIF image support]) | 148 | OPTION_DEFAULT_ON([gif],[don't compile with GIF image support]) |
| 149 | OPTION_DEFAULT_ON([png],[don't compile with PNG image support]) | 149 | OPTION_DEFAULT_ON([png],[don't compile with PNG image support]) |
| 150 | OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support]) | 150 | OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support]) |
| 151 | OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) | ||
| 151 | 152 | ||
| 152 | OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) | 153 | OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) |
| 153 | OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support]) | 154 | OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support]) |
| @@ -1599,6 +1600,24 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then | |||
| 1599 | fi | 1600 | fi |
| 1600 | fi | 1601 | fi |
| 1601 | 1602 | ||
| 1603 | HAVE_IMAGEMAGICK=no | ||
| 1604 | if test "${HAVE_X11}" = "yes" ; then | ||
| 1605 | if test "${with_imagemagick}" != "no"; then | ||
| 1606 | IMAGEMAGICK_REQUIRED=1 | ||
| 1607 | IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED" | ||
| 1608 | |||
| 1609 | PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :) | ||
| 1610 | AC_SUBST(IMAGEMAGICK_CFLAGS) | ||
| 1611 | AC_SUBST(IMAGEMAGICK_LIBS) | ||
| 1612 | |||
| 1613 | if test ".${IMAGEMAGICK_CFLAGS}" != "."; then | ||
| 1614 | HAVE_IMAGEMAGICK=yes | ||
| 1615 | AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) | ||
| 1616 | CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" | ||
| 1617 | LIBS="$IMAGEMAGICK_LIBS $LIBS" | ||
| 1618 | fi | ||
| 1619 | fi | ||
| 1620 | fi | ||
| 1602 | 1621 | ||
| 1603 | HAVE_GTK=no | 1622 | HAVE_GTK=no |
| 1604 | if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then | 1623 | if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then |
| @@ -3083,6 +3102,7 @@ echo " Does Emacs use -ltiff? ${HAVE_TIFF}" | |||
| 3083 | echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF" | 3102 | echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF" |
| 3084 | echo " Does Emacs use -lpng? ${HAVE_PNG}" | 3103 | echo " Does Emacs use -lpng? ${HAVE_PNG}" |
| 3085 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" | 3104 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" |
| 3105 | echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}" | ||
| 3086 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" | 3106 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" |
| 3087 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | 3107 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" |
| 3088 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" | 3108 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" |
diff --git a/lisp/image.el b/lisp/image.el index 67c1ad946b1..963093c6149 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -690,6 +690,31 @@ shall be displayed." | |||
| 690 | (cons images (+ (aref anim 1) (* (aref anim 2) 256)))))))) | 690 | (cons images (+ (aref anim 1) (* (aref anim 2) 256)))))))) |
| 691 | 691 | ||
| 692 | 692 | ||
| 693 | (defconst imagemagick-types-inhibit | ||
| 694 | '(C HTML HTM TXT) | ||
| 695 | "Types the imagemagic loader should not try to handle.") | ||
| 696 | |||
| 697 | ;;;###autoload | ||
| 698 | (defun imagemagic-register-types () | ||
| 699 | "Register file types that imagemagick is able to handle." | ||
| 700 | (let ((im-types (imagemagick-types)) | ||
| 701 | (im-inhibit imagemagick-types-inhibit)) | ||
| 702 | (while im-inhibit | ||
| 703 | (setq im-types (remove (car im-inhibit) im-types)) | ||
| 704 | (setq im-inhibit (cdr im-inhibit))) | ||
| 705 | (while im-types | ||
| 706 | (let | ||
| 707 | ((extension (downcase (symbol-name (car im-types))))) | ||
| 708 | (push | ||
| 709 | (cons (concat "\\." extension "\\'") 'image-mode) | ||
| 710 | auto-mode-alist) | ||
| 711 | (push | ||
| 712 | (cons (concat "\\." extension "\\'") 'imagemagick) | ||
| 713 | image-type-file-name-regexps) | ||
| 714 | (setq im-types (cdr im-types)))))) | ||
| 715 | |||
| 716 | |||
| 717 | |||
| 693 | (provide 'image) | 718 | (provide 'image) |
| 694 | 719 | ||
| 695 | ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 | 720 | ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 |
diff --git a/src/Makefile.in b/src/Makefile.in index 53904a3992a..a71292e14f7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | |||
| 1 | # Makefile for GNU Emacs. | 2 | # Makefile for GNU Emacs. |
| 2 | # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, | 3 | # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, |
| 3 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| @@ -269,7 +270,9 @@ GCONF_LIBS = @GCONF_LIBS@ | |||
| 269 | 270 | ||
| 270 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM | 271 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM |
| 271 | since it may have -I options that should override those two. */ | 272 | since it may have -I options that should override those two. */ |
| 272 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} | 273 | |
| 274 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} | ||
| 275 | |||
| 273 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ | 276 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ |
| 274 | 277 | ||
| 275 | .SUFFIXES: .m | 278 | .SUFFIXES: .m |
| @@ -388,6 +391,9 @@ CFLAGS_SOUND= @CFLAGS_SOUND@ | |||
| 388 | RSVG_LIBS= @RSVG_LIBS@ | 391 | RSVG_LIBS= @RSVG_LIBS@ |
| 389 | RSVG_CFLAGS= @RSVG_CFLAGS@ | 392 | RSVG_CFLAGS= @RSVG_CFLAGS@ |
| 390 | 393 | ||
| 394 | IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@ | ||
| 395 | IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@ | ||
| 396 | |||
| 391 | #ifndef ORDINARY_LINK | 397 | #ifndef ORDINARY_LINK |
| 392 | /* Fix linking if compiled with GCC. */ | 398 | /* Fix linking if compiled with GCC. */ |
| 393 | #ifdef __GNUC__ | 399 | #ifdef __GNUC__ |
| @@ -850,7 +856,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ | |||
| 850 | duplicated symbols. If the standard libraries were compiled | 856 | duplicated symbols. If the standard libraries were compiled |
| 851 | with GCC, we might need gnulib again after them. */ | 857 | with GCC, we might need gnulib again after them. */ |
| 852 | 858 | ||
| 853 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ | 859 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) ${IMAGEMAGICK_LIBS} $(DBUS_LIBS) \ |
| 854 | @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ | 860 | @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ |
| 855 | $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ | 861 | $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ |
| 856 | @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ | 862 | @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ |
diff --git a/src/image.c b/src/image.c index 030e06ad77a..8159575e640 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -606,7 +606,7 @@ extern Lisp_Object QCdata, QCtype; | |||
| 606 | extern Lisp_Object Qcenter; | 606 | extern Lisp_Object Qcenter; |
| 607 | Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; | 607 | Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; |
| 608 | Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; | 608 | Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; |
| 609 | Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; | 609 | Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry, QCcrop, QCrotation; |
| 610 | 610 | ||
| 611 | /* Other symbols. */ | 611 | /* Other symbols. */ |
| 612 | 612 | ||
| @@ -7538,6 +7538,449 @@ gif_load (struct frame *f, struct image *img) | |||
| 7538 | #endif /* HAVE_GIF */ | 7538 | #endif /* HAVE_GIF */ |
| 7539 | 7539 | ||
| 7540 | 7540 | ||
| 7541 | /*********************************************************************** | ||
| 7542 | imagemagick | ||
| 7543 | ***********************************************************************/ | ||
| 7544 | #if defined (HAVE_IMAGEMAGICK) | ||
| 7545 | Lisp_Object Vimagemagick_render_type; | ||
| 7546 | /* Function prototypes. */ | ||
| 7547 | |||
| 7548 | static int imagemagick_image_p (Lisp_Object object); | ||
| 7549 | static int imagemagick_load (struct frame *f, struct image *img); | ||
| 7550 | |||
| 7551 | static int imagemagick_load_image (struct frame *, struct image *, | ||
| 7552 | unsigned char *, unsigned int, unsigned char *); | ||
| 7553 | |||
| 7554 | /* The symbol `imagemagick' identifying images of this type. */ | ||
| 7555 | |||
| 7556 | Lisp_Object Qimagemagick; | ||
| 7557 | Lisp_Object Vimagemagick_render_type; | ||
| 7558 | |||
| 7559 | /* Indices of image specification fields in imagemagick_format, below. */ | ||
| 7560 | |||
| 7561 | enum imagemagick_keyword_index | ||
| 7562 | { | ||
| 7563 | IMAGEMAGICK_TYPE, | ||
| 7564 | IMAGEMAGICK_DATA, | ||
| 7565 | IMAGEMAGICK_FILE, | ||
| 7566 | IMAGEMAGICK_ASCENT, | ||
| 7567 | IMAGEMAGICK_MARGIN, | ||
| 7568 | IMAGEMAGICK_RELIEF, | ||
| 7569 | IMAGEMAGICK_ALGORITHM, | ||
| 7570 | IMAGEMAGICK_HEURISTIC_MASK, | ||
| 7571 | IMAGEMAGICK_MASK, | ||
| 7572 | IMAGEMAGICK_BACKGROUND, | ||
| 7573 | IMAGEMAGICK_LAST | ||
| 7574 | }; | ||
| 7575 | |||
| 7576 | /* Vector of image_keyword structures describing the format | ||
| 7577 | of valid user-defined image specifications. */ | ||
| 7578 | |||
| 7579 | static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] = | ||
| 7580 | { | ||
| 7581 | {":type", IMAGE_SYMBOL_VALUE, 1}, | ||
| 7582 | {":data", IMAGE_STRING_VALUE, 0}, | ||
| 7583 | {":file", IMAGE_STRING_VALUE, 0}, | ||
| 7584 | {":ascent", IMAGE_ASCENT_VALUE, 0}, | ||
| 7585 | {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, | ||
| 7586 | {":relief", IMAGE_INTEGER_VALUE, 0}, | ||
| 7587 | {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, | ||
| 7588 | {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, | ||
| 7589 | {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, | ||
| 7590 | {":background", IMAGE_STRING_OR_NIL_VALUE, 0} | ||
| 7591 | }; | ||
| 7592 | /* Free X resources of imagemagick image IMG which is used on frame F. */ | ||
| 7593 | |||
| 7594 | static void | ||
| 7595 | imagemagick_clear_image (f, img) | ||
| 7596 | struct frame *f; | ||
| 7597 | struct image *img; | ||
| 7598 | { | ||
| 7599 | printf("clearing imagemagick image\n"); | ||
| 7600 | x_clear_image (f, img); | ||
| 7601 | } | ||
| 7602 | |||
| 7603 | /* Structure describing the image type `imagemagick'. Its the same type of | ||
| 7604 | structure defined for all image formats, handled by Emacs image | ||
| 7605 | functions. See struct image_type in dispextern.h. */ | ||
| 7606 | |||
| 7607 | static struct image_type imagemagick_type = | ||
| 7608 | { | ||
| 7609 | /* An identifier showing that this is an image structure for the IMAGEMAGICK format. */ | ||
| 7610 | &Qimagemagick, | ||
| 7611 | /* Handle to a function that can be used to identify a IMAGEMAGICK file. */ | ||
| 7612 | imagemagick_image_p, | ||
| 7613 | /* Handle to function used to load a IMAGEMAGICK file. */ | ||
| 7614 | imagemagick_load, | ||
| 7615 | /* Handle to function to free resources for IMAGEMAGICK. */ | ||
| 7616 | imagemagick_clear_image, | ||
| 7617 | /* An internal field to link to the next image type in a list of | ||
| 7618 | image types, will be filled in when registering the format. */ | ||
| 7619 | NULL | ||
| 7620 | }; | ||
| 7621 | |||
| 7622 | |||
| 7623 | /* Return non-zero if OBJECT is a valid IMAGEMAGICK image specification. Do | ||
| 7624 | this by calling parse_image_spec and supplying the keywords that | ||
| 7625 | identify the IMAGEMAGICK format. */ | ||
| 7626 | |||
| 7627 | static int | ||
| 7628 | imagemagick_image_p (object) | ||
| 7629 | Lisp_Object object; | ||
| 7630 | { | ||
| 7631 | struct image_keyword fmt[IMAGEMAGICK_LAST]; | ||
| 7632 | bcopy (imagemagick_format, fmt, sizeof fmt); | ||
| 7633 | |||
| 7634 | if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick)) | ||
| 7635 | return 0; | ||
| 7636 | |||
| 7637 | /* Must specify either the :data or :file keyword. */ | ||
| 7638 | return fmt[IMAGEMAGICK_FILE].count + fmt[IMAGEMAGICK_DATA].count == 1; | ||
| 7639 | } | ||
| 7640 | |||
| 7641 | /* The GIF library also defines DrawRectangle, but its never used in Emacs. | ||
| 7642 | Therefore rename the function so it doesnt collide with ImageMagick. */ | ||
| 7643 | #define DrawRectangle DrawRectangleGif | ||
| 7644 | #include <wand/MagickWand.h> | ||
| 7645 | |||
| 7646 | /* Load IMAGEMAGICK image IMG for use on frame F. Value is non-zero if | ||
| 7647 | successful. this function will go into the imagemagick_type structure, and | ||
| 7648 | the prototype thus needs to be compatible with that structure. */ | ||
| 7649 | |||
| 7650 | static int | ||
| 7651 | imagemagick_load (f, img) | ||
| 7652 | struct frame *f; | ||
| 7653 | struct image *img; | ||
| 7654 | { | ||
| 7655 | int success_p = 0; | ||
| 7656 | Lisp_Object file_name; | ||
| 7657 | |||
| 7658 | /* If IMG->spec specifies a file name, create a non-file spec from it. */ | ||
| 7659 | file_name = image_spec_value (img->spec, QCfile, NULL); | ||
| 7660 | if (STRINGP (file_name)) | ||
| 7661 | { | ||
| 7662 | Lisp_Object file; | ||
| 7663 | unsigned char *contents; | ||
| 7664 | int size; | ||
| 7665 | struct gcpro gcpro1; | ||
| 7666 | |||
| 7667 | file = x_find_image_file (file_name); | ||
| 7668 | GCPRO1 (file); | ||
| 7669 | if (!STRINGP (file)) | ||
| 7670 | { | ||
| 7671 | image_error ("Cannot find image file `%s'", file_name, Qnil); | ||
| 7672 | UNGCPRO; | ||
| 7673 | return 0; | ||
| 7674 | } | ||
| 7675 | |||
| 7676 | /* Read the entire file into memory. */ | ||
| 7677 | /* contents = slurp_file (SDATA (file), &size); */ | ||
| 7678 | /* if (contents == NULL) */ | ||
| 7679 | /* { */ | ||
| 7680 | /* image_error ("Error loading IMAGEMAGICK image `%s'", img->spec, Qnil); */ | ||
| 7681 | /* UNGCPRO; */ | ||
| 7682 | /* return 0; */ | ||
| 7683 | /* } */ | ||
| 7684 | /* If the file was slurped into memory properly, parse it. */ | ||
| 7685 | success_p = imagemagick_load_image (f, img, 0, 0, SDATA(file_name)); | ||
| 7686 | UNGCPRO; | ||
| 7687 | } | ||
| 7688 | /* Else its not a file, its a lisp object. Load the image from a | ||
| 7689 | lisp object rather than a file. */ | ||
| 7690 | else | ||
| 7691 | { | ||
| 7692 | Lisp_Object data; | ||
| 7693 | |||
| 7694 | data = image_spec_value (img->spec, QCdata, NULL); | ||
| 7695 | success_p = imagemagick_load_image (f, img, SDATA (data), SBYTES (data),NULL); | ||
| 7696 | } | ||
| 7697 | |||
| 7698 | return success_p; | ||
| 7699 | } | ||
| 7700 | |||
| 7701 | /* imagemagick_load_image is a helper function for imagemagick_load, which does the | ||
| 7702 | actual loading given contents and size, apart from frame and image | ||
| 7703 | structures, passed from imagemagick_load. | ||
| 7704 | |||
| 7705 | Uses librimagemagick to do most of the image processing. | ||
| 7706 | |||
| 7707 | Returns non-zero when successful. | ||
| 7708 | */ | ||
| 7709 | |||
| 7710 | static int | ||
| 7711 | imagemagick_load_image (f, img, contents, size, filename) | ||
| 7712 | /* Pointer to emacs frame structure. */ | ||
| 7713 | struct frame *f; | ||
| 7714 | /* Pointer to emacs image structure. */ | ||
| 7715 | struct image *img; | ||
| 7716 | /* String containing the IMAGEMAGICK data to be parsed. */ | ||
| 7717 | unsigned char *contents; | ||
| 7718 | /* Size of data in bytes. */ | ||
| 7719 | unsigned int size; | ||
| 7720 | /* Filename, either pass filename or contents/size. */ | ||
| 7721 | unsigned char *filename; | ||
| 7722 | { | ||
| 7723 | long unsigned int width; | ||
| 7724 | long unsigned int height; | ||
| 7725 | |||
| 7726 | MagickBooleanType | ||
| 7727 | status; | ||
| 7728 | |||
| 7729 | XImagePtr ximg; | ||
| 7730 | Lisp_Object specified_bg; | ||
| 7731 | XColor background; | ||
| 7732 | int x; | ||
| 7733 | int y; | ||
| 7734 | |||
| 7735 | MagickWand *image_wand; | ||
| 7736 | PixelIterator *iterator; | ||
| 7737 | PixelWand **pixels; | ||
| 7738 | MagickPixelPacket pixel; | ||
| 7739 | |||
| 7740 | |||
| 7741 | /* image_wand will contain the image. */ | ||
| 7742 | image_wand = NewMagickWand(); | ||
| 7743 | |||
| 7744 | /* Parse the contents argument and initialize image_wand. */ | ||
| 7745 | if(filename!=NULL) | ||
| 7746 | status=MagickReadImage(image_wand, filename); | ||
| 7747 | else | ||
| 7748 | status=MagickReadImageBlob(image_wand, contents, size); | ||
| 7749 | image_error ("im read failed", Qnil, Qnil); | ||
| 7750 | if (status == MagickFalse) goto imagemagick_error; | ||
| 7751 | |||
| 7752 | /* Handle image index for image types who can contain more than one image. | ||
| 7753 | Interface :index is same as for GIF. */ | ||
| 7754 | Lisp_Object image; | ||
| 7755 | long ino; | ||
| 7756 | image = image_spec_value (img->spec, QCindex, NULL); | ||
| 7757 | ino = INTEGERP (image) ? XFASTINT (image) : 0; | ||
| 7758 | |||
| 7759 | /* if (ino >= ) */ | ||
| 7760 | /* { */ | ||
| 7761 | /* image_error ("Invalid image number `%s' in image `%s'", */ | ||
| 7762 | /* image, img->spec); */ | ||
| 7763 | /* UNGCPRO; */ | ||
| 7764 | /* return 0; */ | ||
| 7765 | /* } */ | ||
| 7766 | |||
| 7767 | if(ino==0) | ||
| 7768 | MagickSetFirstIterator(image_wand); | ||
| 7769 | else | ||
| 7770 | MagickSetIteratorIndex(image_wand, ino); | ||
| 7771 | |||
| 7772 | /* | ||
| 7773 | If width and/or height is set in the display spec | ||
| 7774 | assume we want to scale to those. */ | ||
| 7775 | |||
| 7776 | int desired_width, desired_height; | ||
| 7777 | Lisp_Object value; | ||
| 7778 | value = image_spec_value (img->spec, QCwidth, NULL); | ||
| 7779 | desired_width = (INTEGERP (value) ? XFASTINT (value) : -1); | ||
| 7780 | value = image_spec_value (img->spec, QCheight, NULL); | ||
| 7781 | desired_height = (INTEGERP (value) ? XFASTINT (value) : -1); | ||
| 7782 | if(desired_width != -1 && desired_height != -1){ | ||
| 7783 | printf("MagickScaleImage %d %d\n",desired_width, desired_height); | ||
| 7784 | status=MagickScaleImage(image_wand, desired_width, desired_height); | ||
| 7785 | if (status == MagickFalse) { | ||
| 7786 | image_error ("Imagemagick scale failed", Qnil, Qnil); | ||
| 7787 | goto imagemagick_error; | ||
| 7788 | } | ||
| 7789 | |||
| 7790 | } | ||
| 7791 | |||
| 7792 | /* Also support :geometry and :crop which are imagemagick specific descriptors. */ | ||
| 7793 | |||
| 7794 | Lisp_Object crop, geometry; | ||
| 7795 | crop = image_spec_value (img->spec, QCcrop, NULL); | ||
| 7796 | geometry = image_spec_value (img->spec, QCgeometry, NULL); | ||
| 7797 | if (STRINGP (crop) && STRINGP (geometry)){ | ||
| 7798 | printf("MagickTransformImage %s %s\n",SDATA(crop), SDATA(geometry)); | ||
| 7799 | image_wand = MagickTransformImage (image_wand, SDATA (crop), SDATA (geometry)); | ||
| 7800 | /* TODO differ between image_wand and transform_wand. */ | ||
| 7801 | } | ||
| 7802 | |||
| 7803 | /* Furthermore :rotation. we need background color and angle for rotation. */ | ||
| 7804 | /* | ||
| 7805 | TODO background handling for rotation | ||
| 7806 | specified_bg = image_spec_value (img->spec, QCbackground, NULL); | ||
| 7807 | if (!STRINGP (specified_bg) | ||
| 7808 | */ | ||
| 7809 | double rotation; | ||
| 7810 | value = image_spec_value (img->spec, QCrotation, NULL); | ||
| 7811 | if (FLOATP (value)){ | ||
| 7812 | PixelWand* background = NewPixelWand(); | ||
| 7813 | PixelSetColor (background, "#ffffff");/*TODO remove hardcode*/ | ||
| 7814 | |||
| 7815 | rotation = extract_float (value); | ||
| 7816 | printf ("MagickRotateImage %f\n",rotation); | ||
| 7817 | |||
| 7818 | status=MagickRotateImage (image_wand, background,rotation); | ||
| 7819 | DestroyPixelWand (background); | ||
| 7820 | if (status == MagickFalse) { | ||
| 7821 | image_error ("Imagemagick image rotate failed", Qnil, Qnil); | ||
| 7822 | goto imagemagick_error; | ||
| 7823 | } | ||
| 7824 | } | ||
| 7825 | |||
| 7826 | /* Finaly we are done manipulating the image, | ||
| 7827 | figure out resulting width, height, and then transfer ownerwship to Emacs. | ||
| 7828 | */ | ||
| 7829 | height=MagickGetImageHeight (image_wand); | ||
| 7830 | width=MagickGetImageWidth (image_wand); | ||
| 7831 | if (status == MagickFalse) { | ||
| 7832 | image_error ("Imagemagick image get size failed", Qnil, Qnil); | ||
| 7833 | goto imagemagick_error; | ||
| 7834 | } | ||
| 7835 | |||
| 7836 | if (! check_image_size (f, width, height)) | ||
| 7837 | { | ||
| 7838 | image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); | ||
| 7839 | goto imagemagick_error; | ||
| 7840 | } | ||
| 7841 | |||
| 7842 | /* We can now get a valid pixel buffer from the imagemagick file, if all | ||
| 7843 | went ok. */ | ||
| 7844 | |||
| 7845 | |||
| 7846 | init_color_table (); | ||
| 7847 | int imagemagick_rendermethod=(INTEGERP (Vimagemagick_render_type) ? XFASTINT (Vimagemagick_render_type) : 0); | ||
| 7848 | if (imagemagick_rendermethod==0){ | ||
| 7849 | /* Try to create a x pixmap to hold the imagemagick pixmap. */ | ||
| 7850 | if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)){ | ||
| 7851 | image_error("Imagemagick X bitmap allocation failure",Qnil,Qnil); | ||
| 7852 | goto imagemagick_error; | ||
| 7853 | } | ||
| 7854 | |||
| 7855 | /* Copy imagegmagick image to x with primitive yet robust pixel | ||
| 7856 | pusher loop. This has been tested a lot with many different | ||
| 7857 | images, it doesnt work too well with image archive formats though! | ||
| 7858 | |||
| 7859 | Also seems slow. | ||
| 7860 | */ | ||
| 7861 | |||
| 7862 | /* Copy pixels from the imagemagick image structure to the x image map. */ | ||
| 7863 | iterator = NewPixelIterator (image_wand); | ||
| 7864 | if ((iterator == (PixelIterator *) NULL)) { | ||
| 7865 | image_error ("Imagemagick pixel iterator creation failed", Qnil, Qnil); | ||
| 7866 | goto imagemagick_error; | ||
| 7867 | } | ||
| 7868 | |||
| 7869 | for (y=0; y < (long) MagickGetImageHeight(image_wand); y++) | ||
| 7870 | { | ||
| 7871 | pixels = PixelGetNextIteratorRow (iterator, &width); | ||
| 7872 | if ((pixels == (PixelWand **) NULL)) | ||
| 7873 | break; | ||
| 7874 | for (x=0; x < (long) width; x++) | ||
| 7875 | { | ||
| 7876 | PixelGetMagickColor (pixels[x], &pixel); | ||
| 7877 | XPutPixel (ximg, x, y, lookup_rgb_color (f, pixel.red, pixel.green, pixel.blue)); | ||
| 7878 | } | ||
| 7879 | } | ||
| 7880 | DestroyPixelIterator (iterator); | ||
| 7881 | } | ||
| 7882 | |||
| 7883 | if (imagemagick_rendermethod==1){ | ||
| 7884 | /* Try if magicexportimage is any faster than pixelpushing. */ | ||
| 7885 | /* printf("ximg: bitmap_unit:%d format:%d byte_order:%d depth:%d bits_per_pixel:%d\n", */ | ||
| 7886 | /* ximg->bitmap_unit,ximg->format,ximg->byte_order,ximg->depth,ximg->bits_per_pixel); */ | ||
| 7887 | int imagedepth=24;/*MagickGetImageDepth(image_wand);*/ | ||
| 7888 | char* exportdepth= imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/ | ||
| 7889 | /* Try to create a x pixmap to hold the imagemagick pixmap. */ | ||
| 7890 | printf("imagedepth:%d exportdepth:%s\n", imagedepth, exportdepth); | ||
| 7891 | if (!x_create_x_image_and_pixmap (f, width, height, imagedepth, &ximg, &img->pixmap)){ | ||
| 7892 | image_error("Imagemagick X bitmap allocation failure",Qnil,Qnil); | ||
| 7893 | goto imagemagick_error; | ||
| 7894 | } | ||
| 7895 | |||
| 7896 | |||
| 7897 | /* Oddly, the below code doesnt seem to work:*/ | ||
| 7898 | int pixelwidth; | ||
| 7899 | /* switch(ximg->bitmap_unit){ */ | ||
| 7900 | /* case 8: */ | ||
| 7901 | /* pixelwidth=CharPixel; */ | ||
| 7902 | /* break; */ | ||
| 7903 | /* case 16: */ | ||
| 7904 | /* pixelwidth=ShortPixel; */ | ||
| 7905 | /* break; */ | ||
| 7906 | /* case 32: */ | ||
| 7907 | /* pixelwidth=LongPixel; */ | ||
| 7908 | /* break; */ | ||
| 7909 | /* } */ | ||
| 7910 | /* | ||
| 7911 | Here im just guessing the format of the bitmap. | ||
| 7912 | happens to work fine for: | ||
| 7913 | - bw djvu images | ||
| 7914 | on rgb display. | ||
| 7915 | seems about 3 times as fast as pixel pushing(not carefully measured) | ||
| 7916 | with color djvu, the bitplanes are mapped to wrong color(seems fixed). | ||
| 7917 | |||
| 7918 | */ | ||
| 7919 | pixelwidth=CharPixel;/*??? TODO figure out*/ | ||
| 7920 | MagickExportImagePixels(image_wand, | ||
| 7921 | 0,0, | ||
| 7922 | width,height, | ||
| 7923 | exportdepth, | ||
| 7924 | pixelwidth, | ||
| 7925 | /*&(img->pixmap));*/ | ||
| 7926 | ximg->data); | ||
| 7927 | } | ||
| 7928 | |||
| 7929 | #ifdef COLOR_TABLE_SUPPORT | ||
| 7930 | /* Remember colors allocated for this image. */ | ||
| 7931 | img->colors = colors_in_color_table (&img->ncolors); | ||
| 7932 | free_color_table (); | ||
| 7933 | #endif /* COLOR_TABLE_SUPPORT */ | ||
| 7934 | |||
| 7935 | |||
| 7936 | img->width = width; | ||
| 7937 | img->height = height; | ||
| 7938 | |||
| 7939 | /* Maybe fill in the background field while we have ximg handy. | ||
| 7940 | Casting avoids a GCC warning. */ | ||
| 7941 | /* IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg);*/ | ||
| 7942 | |||
| 7943 | /* Put the image into the pixmap, then free the X image and its | ||
| 7944 | buffer. */ | ||
| 7945 | x_put_x_image (f, ximg, img->pixmap, width, height); | ||
| 7946 | |||
| 7947 | x_destroy_x_image (ximg); | ||
| 7948 | |||
| 7949 | |||
| 7950 | /* JAVE TODO more cleanup. */ | ||
| 7951 | DestroyMagickWand (image_wand); | ||
| 7952 | |||
| 7953 | return 1; | ||
| 7954 | |||
| 7955 | imagemagick_error: | ||
| 7956 | /* TODO more cleanup. */ | ||
| 7957 | image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil); | ||
| 7958 | printf("Imagemagick error, see *Messages*\n"); | ||
| 7959 | return 0; | ||
| 7960 | } | ||
| 7961 | |||
| 7962 | DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0,0,0, | ||
| 7963 | doc: /* Return image file types supported by ImageMagick. | ||
| 7964 | Since ImageMagic recognizes a lot of file-types that clash with Emacs, | ||
| 7965 | such as .c, we want to be able to alter the list at the lisp level. */) | ||
| 7966 | () | ||
| 7967 | { | ||
| 7968 | Lisp_Object typelist = Qnil; | ||
| 7969 | unsigned long numf; | ||
| 7970 | ExceptionInfo ex; | ||
| 7971 | char** imtypes = GetMagickList ("*", &numf, &ex); | ||
| 7972 | int i; | ||
| 7973 | Lisp_Object Qimagemagicktype; | ||
| 7974 | for (i = 0; i < numf; i++) { | ||
| 7975 | Qimagemagicktype = intern (*( imtypes + i)); | ||
| 7976 | typelist = Fcons (Qimagemagicktype, typelist); | ||
| 7977 | } | ||
| 7978 | return typelist; | ||
| 7979 | } | ||
| 7980 | |||
| 7981 | #endif /* defined (HAVE_IMAGEMAGICK) */ | ||
| 7982 | |||
| 7983 | |||
| 7541 | 7984 | ||
| 7542 | /*********************************************************************** | 7985 | /*********************************************************************** |
| 7543 | SVG | 7986 | SVG |
| @@ -8335,6 +8778,14 @@ of `image-library-alist', which see). */) | |||
| 8335 | return CHECK_LIB_AVAILABLE (&svg_type, init_svg_functions, libraries); | 8778 | return CHECK_LIB_AVAILABLE (&svg_type, init_svg_functions, libraries); |
| 8336 | #endif | 8779 | #endif |
| 8337 | 8780 | ||
| 8781 | #if defined (HAVE_IMAGEMAGICK) | ||
| 8782 | if (EQ (type, Qimagemagick)){ | ||
| 8783 | /* MagickWandGenesis() initalizes the imagemagick library. */ | ||
| 8784 | MagickWandGenesis(); | ||
| 8785 | return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions, libraries); | ||
| 8786 | } | ||
| 8787 | #endif | ||
| 8788 | |||
| 8338 | #ifdef HAVE_GHOSTSCRIPT | 8789 | #ifdef HAVE_GHOSTSCRIPT |
| 8339 | if (EQ (type, Qpostscript)) | 8790 | if (EQ (type, Qpostscript)) |
| 8340 | return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries); | 8791 | return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries); |
| @@ -8345,6 +8796,7 @@ of `image-library-alist', which see). */) | |||
| 8345 | return Qnil; | 8796 | return Qnil; |
| 8346 | } | 8797 | } |
| 8347 | 8798 | ||
| 8799 | |||
| 8348 | void | 8800 | void |
| 8349 | syms_of_image () | 8801 | syms_of_image () |
| 8350 | { | 8802 | { |
| @@ -8422,7 +8874,14 @@ non-numeric, there is no explicit limit on the size of images. */); | |||
| 8422 | staticpro (&QCheuristic_mask); | 8874 | staticpro (&QCheuristic_mask); |
| 8423 | QCindex = intern_c_string (":index"); | 8875 | QCindex = intern_c_string (":index"); |
| 8424 | staticpro (&QCindex); | 8876 | staticpro (&QCindex); |
| 8877 | QCgeometry = intern (":geometry"); | ||
| 8878 | staticpro (&QCgeometry); | ||
| 8879 | QCcrop = intern (":crop"); | ||
| 8880 | staticpro (&QCcrop); | ||
| 8881 | QCrotation = intern (":rotation"); | ||
| 8882 | staticpro (&QCrotation); | ||
| 8425 | QCmatrix = intern_c_string (":matrix"); | 8883 | QCmatrix = intern_c_string (":matrix"); |
| 8884 | |||
| 8426 | staticpro (&QCmatrix); | 8885 | staticpro (&QCmatrix); |
| 8427 | QCcolor_adjustment = intern_c_string (":color-adjustment"); | 8886 | QCcolor_adjustment = intern_c_string (":color-adjustment"); |
| 8428 | staticpro (&QCcolor_adjustment); | 8887 | staticpro (&QCcolor_adjustment); |
| @@ -8482,6 +8941,12 @@ non-numeric, there is no explicit limit on the size of images. */); | |||
| 8482 | ADD_IMAGE_TYPE (Qpng); | 8941 | ADD_IMAGE_TYPE (Qpng); |
| 8483 | #endif | 8942 | #endif |
| 8484 | 8943 | ||
| 8944 | #if defined (HAVE_IMAGEMAGICK) | ||
| 8945 | Qimagemagick = intern ("imagemagick"); | ||
| 8946 | staticpro (&Qimagemagick); | ||
| 8947 | ADD_IMAGE_TYPE (Qimagemagick); | ||
| 8948 | #endif | ||
| 8949 | |||
| 8485 | #if defined (HAVE_RSVG) | 8950 | #if defined (HAVE_RSVG) |
| 8486 | Qsvg = intern_c_string ("svg"); | 8951 | Qsvg = intern_c_string ("svg"); |
| 8487 | staticpro (&Qsvg); | 8952 | staticpro (&Qsvg); |
| @@ -8498,6 +8963,9 @@ non-numeric, there is no explicit limit on the size of images. */); | |||
| 8498 | #endif /* HAVE_RSVG */ | 8963 | #endif /* HAVE_RSVG */ |
| 8499 | 8964 | ||
| 8500 | defsubr (&Sinit_image_library); | 8965 | defsubr (&Sinit_image_library); |
| 8966 | #ifdef HAVE_IMAGEMAGICK | ||
| 8967 | defsubr (&Simagemagick_types); | ||
| 8968 | #endif | ||
| 8501 | defsubr (&Sclear_image_cache); | 8969 | defsubr (&Sclear_image_cache); |
| 8502 | defsubr (&Simage_refresh); | 8970 | defsubr (&Simage_refresh); |
| 8503 | defsubr (&Simage_size); | 8971 | defsubr (&Simage_size); |
| @@ -8525,12 +8993,20 @@ When an image has not been displayed this many seconds, remove it | |||
| 8525 | from the image cache. Value must be an integer or nil with nil | 8993 | from the image cache. Value must be an integer or nil with nil |
| 8526 | meaning don't clear the cache. */); | 8994 | meaning don't clear the cache. */); |
| 8527 | Vimage_cache_eviction_delay = make_number (30 * 60); | 8995 | Vimage_cache_eviction_delay = make_number (30 * 60); |
| 8996 | |||
| 8997 | #ifdef HAVE_IMAGEMAGICK | ||
| 8998 | DEFVAR_LISP ("imagemagick-render-type", &Vimagemagick_render_type, | ||
| 8999 | doc: /* */); | ||
| 9000 | #endif | ||
| 8528 | } | 9001 | } |
| 8529 | 9002 | ||
| 8530 | void | 9003 | void |
| 8531 | init_image () | 9004 | init_image () |
| 8532 | { | 9005 | { |
| 9006 | |||
| 8533 | } | 9007 | } |
| 8534 | 9008 | ||
| 9009 | |||
| 9010 | |||
| 8535 | /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9 | 9011 | /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9 |
| 8536 | (do not change this comment) */ | 9012 | (do not change this comment) */ |