Mercurial > hg > xemacs-beta
comparison configure.in @ 373:6240c7796c7a r21-2b2
Import from CVS: tag r21-2b2
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:04:06 +0200 |
parents | cc15677e0335 |
children | a300bb07d72d |
comparison
equal
deleted
inserted
replaced
372:49e1ed2d7ed8 | 373:6240c7796c7a |
---|---|
77 [cat > conftest.$ac_ext <<EOF | 77 [cat > conftest.$ac_ext <<EOF |
78 [#]line __oline__ "configure" | 78 [#]line __oline__ "configure" |
79 #include "confdefs.h" | 79 #include "confdefs.h" |
80 [$1] | 80 [$1] |
81 EOF | 81 EOF |
82 if AC_TRY_EVAL(ac_link) && test -s conftest && (./conftest; exit) 2>&AC_FD_CC | 82 if AC_TRY_EVAL(ac_link) && test -s conftest && (./conftest; exit $?) 2>&AC_FD_CC |
83 then | 83 then |
84 dnl Do not remove the temporary files here, so they can be examined. | 84 dnl Do not remove the temporary files here, so they can be examined. |
85 ifelse([$2], , :, [$2]) | 85 ifelse([$2], , :, [$2]) |
86 else | 86 else |
87 conftest_rc="$?" | |
87 echo "configure: failed program was:" >&AC_FD_CC | 88 echo "configure: failed program was:" >&AC_FD_CC |
88 cat conftest.$ac_ext >&AC_FD_CC | 89 cat conftest.$ac_ext >&AC_FD_CC |
89 ifelse([$3], , , [ rm -fr conftest* | 90 ifelse([$3], , , [ rm -fr conftest* |
90 $3 | 91 $3 |
91 ])dnl | 92 ])dnl |
1017 machine='' opsys='' | 1018 machine='' opsys='' |
1018 | 1019 |
1019 dnl Straightforward machine determination | 1020 dnl Straightforward machine determination |
1020 case "$canonical" in | 1021 case "$canonical" in |
1021 sparc-*-* ) machine=sparc ;; | 1022 sparc-*-* ) machine=sparc ;; |
1022 alpha-*-* ) machine=alpha ;; | 1023 alpha*-*-* ) machine=alpha ;; |
1023 vax-*-* ) machine=vax ;; | 1024 vax-*-* ) machine=vax ;; |
1024 mips-dec-* ) machine=pmax ;; | 1025 mips-dec-* ) machine=pmax ;; |
1025 mips-sgi-* ) machine=iris4d ;; | 1026 mips-sgi-* ) machine=iris4d ;; |
1026 romp-ibm-* ) machine=ibmrt ;; | 1027 romp-ibm-* ) machine=ibmrt ;; |
1027 rs6000-ibm-aix* ) machine=ibmrs6000 ;; | 1028 rs6000-ibm-aix* ) machine=ibmrs6000 ;; |
1056 | 1057 |
1057 dnl AIX | 1058 dnl AIX |
1058 *-*-aix3.1* ) opsys=aix3-1 ;; | 1059 *-*-aix3.1* ) opsys=aix3-1 ;; |
1059 *-*-aix3.2.5 ) opsys=aix3-2-5 ;; | 1060 *-*-aix3.2.5 ) opsys=aix3-2-5 ;; |
1060 *-*-aix3* ) opsys=aix3-2 ;; | 1061 *-*-aix3* ) opsys=aix3-2 ;; |
1061 *-*-aix4.2* ) opsys=aix4-2 ;; | 1062 *-*-aix4.0* ) opsys=aix4 ;; |
1062 *-*-aix4.1* ) opsys=aix4-1 ;; | 1063 *-*-aix4.1* ) opsys=aix4-1 ;; |
1063 *-*-aix4* ) opsys=aix4 ;; | 1064 *-*-aix4* ) opsys=aix4-2 ;; |
1064 | 1065 |
1065 dnl Other generic OSes | 1066 dnl Other generic OSes |
1066 *-gnu* ) opsys=gnu ;; | 1067 *-gnu* ) opsys=gnu ;; |
1067 *-*-bsd4.[[01]] ) opsys=bsd4-1 ;; | 1068 *-*-bsd4.[[01]] ) opsys=bsd4-1 ;; |
1068 *-*-bsd4.2 ) opsys=bsd4-2 ;; | 1069 *-*-bsd4.2 ) opsys=bsd4-2 ;; |
1592 AC_MSG_RESULT($have_glibc) | 1593 AC_MSG_RESULT($have_glibc) |
1593 dnl I'm tired of pop being broken with GLIBC -slb | 1594 dnl I'm tired of pop being broken with GLIBC -slb |
1594 dnl Well. then why not fix fucking pop? | 1595 dnl Well. then why not fix fucking pop? |
1595 test "$have_glibc" = "yes" && AC_DEFINE(_GNU_SOURCE) | 1596 test "$have_glibc" = "yes" && AC_DEFINE(_GNU_SOURCE) |
1596 | 1597 |
1597 AC_MSG_CHECKING(whether we are using SunPro C) | 1598 |
1598 AC_TRY_COMPILE([],[#ifndef __SUNPRO_C | 1599 dnl Identify compilers to enable compiler-specific hacks. |
1599 #error Not a SunPro compiler :-( | 1600 dnl Add support for other compilers HERE! |
1600 ******* ======= ******** &&&&&&&& | 1601 dnl GCC is already identified elsewhere. |
1602 AC_TRY_RUN([int main () { | |
1603 #if defined __SUNPRO_C | |
1604 return 11; | |
1605 #elif defined __DECC | |
1606 return 12; | |
1607 #else | |
1608 return 0; | |
1601 #endif | 1609 #endif |
1602 ], __sunpro_c=yes, __sunpro_c=no) | 1610 }], [], |
1603 AC_MSG_RESULT($__sunpro_c) | 1611 [case "$conftest_rc" in |
1612 11) echo "You appear to be using the SunPro C compiler."; __SUNPRO_C=yes ;; | |
1613 12) echo "You appear to be using the DEC C compiler." ; __DECC=yes ;; | |
1614 esac]) | |
1615 | |
1604 | 1616 |
1605 dnl case "$canonical" in | 1617 dnl case "$canonical" in |
1606 dnl *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;; | 1618 dnl *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;; |
1607 dnl esac | 1619 dnl esac |
1608 | 1620 |
1724 have_terminfo mail_use_flock mail_use_lockf) && echo "" | 1736 have_terminfo mail_use_flock mail_use_lockf) && echo "" |
1725 | 1737 |
1726 dnl Non-ordinary link usually requires -lc | 1738 dnl Non-ordinary link usually requires -lc |
1727 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" | 1739 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" |
1728 | 1740 |
1741 dnl Compiler-specific hacks | |
1742 dnl DEC C requires -std | |
1743 test "$__DECC" = "yes" && XE_APPEND(-std, c_switch_site) | |
1744 | |
1729 dnl Calculalate value of CFLAGS: | 1745 dnl Calculalate value of CFLAGS: |
1730 dnl Use either command line flag, environment var, or autodetection | 1746 dnl Use either command line flag, environment var, or autodetection |
1731 if test "$cflags_specified" = "no"; then | 1747 if test "$cflags_specified" = "no"; then |
1732 dnl Following values of CFLAGS are known to work well. | 1748 dnl Following values of CFLAGS are known to work well. |
1733 dnl Should we take debugging options into consideration? | 1749 dnl Should we take debugging options into consideration? |
1737 dnl test "$opsys $machine" = "linux intel386" && \ | 1753 dnl test "$opsys $machine" = "linux intel386" && \ |
1738 dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2" | 1754 dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2" |
1739 dnl cygwin can't cope with -O3 | 1755 dnl cygwin can't cope with -O3 |
1740 test "$opsys $machine" = "cygwin32 intel386" && \ | 1756 test "$opsys $machine" = "cygwin32 intel386" && \ |
1741 CFLAGS="-g -O2 -Wall -Wno-switch" | 1757 CFLAGS="-g -O2 -Wall -Wno-switch" |
1742 elif test "$__sunpro_c" = "yes"; then | 1758 elif test "$__SUNPRO_C" = "yes"; then |
1743 case "$opsys" in | 1759 case "$opsys" in |
1744 sol2 ) CFLAGS="-v -xO4" ;; | 1760 sol2 ) CFLAGS="-v -xO4" ;; |
1745 sunos4* ) CFLAGS="-xO2";; | 1761 sunos4* ) CFLAGS="-xO2";; |
1746 esac | 1762 esac |
1763 elif test "$__DECC" = "yes"; then | |
1764 CFLAGS="-O3" | |
1747 elif test "$CC" = "xlc"; then | 1765 elif test "$CC" = "xlc"; then |
1748 CFLAGS="-O3 -qstrict -qnoansialias -qlibansi -qinfo -qro -qmaxmem=20000" | 1766 CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qinfo -qro -qmaxmem=20000" |
1767 dnl ### Add optimal CFLAGS support for other compilers HERE! | |
1749 else | 1768 else |
1750 dnl ### Add tests for other compilers here... | |
1751 CFLAGS="-O" ;dnl The only POSIX-approved flag | 1769 CFLAGS="-O" ;dnl The only POSIX-approved flag |
1752 fi | 1770 fi |
1753 fi | 1771 fi |
1754 | 1772 |
1755 dnl Inform compiler that certain flags are meant for the linker | 1773 dnl Inform compiler that certain flags are meant for the linker |
1887 dnl ------------------------------------- | 1905 dnl ------------------------------------- |
1888 | 1906 |
1889 if test "$dynamic" = "no"; then add_runtime_path=no | 1907 if test "$dynamic" = "no"; then add_runtime_path=no |
1890 elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes | 1908 elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes |
1891 else case "$opsys" in | 1909 else case "$opsys" in |
1892 sol2 | irix* | *bsd* ) add_runtime_path=yes ;; | 1910 sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;; |
1893 * ) add_runtime_path=no ;; | 1911 * ) add_runtime_path=no ;; |
1894 esac | 1912 esac |
1895 fi | 1913 fi |
1896 | 1914 |
1897 if test "$add_runtime_path" = "yes"; then | 1915 if test "$add_runtime_path" = "yes"; then |
1898 dnl Try to autodetect runtime library flag (usually -R), | 1916 dnl Try to autodetect runtime library flag (usually -R), |
1899 dnl and whether it works (or at least does no harm) | 1917 dnl and whether it works (or at least does no harm) |
1900 AC_MSG_CHECKING("for runtime libraries flag") | 1918 AC_MSG_CHECKING("for runtime libraries flag") |
1901 dash_r="" | 1919 case "$opsys" in |
1902 for try_dash_r in "-R" "-R " "-rpath "; do | 1920 sol2 ) dash_r = "-R" ;; |
1903 xe_check_libs="${try_dash_r}/no/such/file-or-directory" | 1921 decosf* | linux* ) dash_r = "-rpath " ;; |
1904 XE_PROTECT_LINKER_FLAGS(xe_check_libs) | 1922 *) |
1905 AC_TRY_LINK(, , dash_r="$try_dash_r") | 1923 dash_r="" |
1906 xe_check_libs="" | 1924 for try_dash_r in "-R" "-R " "-rpath "; do |
1907 test -n "$dash_r" && break | 1925 xe_check_libs="${try_dash_r}/no/such/file-or-directory" |
1908 done | 1926 XE_PROTECT_LINKER_FLAGS(xe_check_libs) |
1927 AC_TRY_LINK(, , dash_r="$try_dash_r") | |
1928 xe_check_libs="" | |
1929 test -n "$dash_r" && break | |
1930 done ;; | |
1931 esac | |
1909 if test -n "$dash_r"; | 1932 if test -n "$dash_r"; |
1910 then AC_MSG_RESULT("\"${dash_r}\"") | 1933 then AC_MSG_RESULT("\"${dash_r}\"") |
1911 else AC_MSG_RESULT(NONE) | 1934 else AC_MSG_RESULT(NONE) |
1912 fi | 1935 fi |
1913 fi | 1936 fi |
2056 AC_PROG_INSTALL | 2079 AC_PROG_INSTALL |
2057 AC_PROG_YACC | 2080 AC_PROG_YACC |
2058 | 2081 |
2059 dnl checks for header files | 2082 dnl checks for header files |
2060 AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h) | 2083 AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h) |
2061 AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h) | 2084 AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h cygwin32/version.h) |
2062 AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h) | 2085 AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h) |
2063 AC_HEADER_SYS_WAIT | 2086 AC_HEADER_SYS_WAIT |
2064 AC_HEADER_STDC | 2087 AC_HEADER_STDC |
2065 AC_HEADER_TIME | 2088 AC_HEADER_TIME |
2066 AC_DECL_SYS_SIGLIST | 2089 AC_DECL_SYS_SIGLIST |
2278 XE_APPEND(-I${inc_dir}, X_CFLAGS) | 2301 XE_APPEND(-I${inc_dir}, X_CFLAGS) |
2279 esac | 2302 esac |
2280 break; dnl Only need ONE X11 implementation ! | 2303 break; dnl Only need ONE X11 implementation ! |
2281 fi | 2304 fi |
2282 done | 2305 done |
2306 | |
2307 dnl Avoid version mismatch for shared library libXm.so on osf4 | |
2308 if test "$GCC" = yes -a -d /usr/shlib; then XE_APPEND(-L/usr/shlib, X_LIBS); fi | |
2283 | 2309 |
2284 ld_switch_x_site="$X_LIBS" | 2310 ld_switch_x_site="$X_LIBS" |
2285 | 2311 |
2286 XE_COMPUTE_RUNPATH() | 2312 XE_COMPUTE_RUNPATH() |
2287 | 2313 |
2649 | 2675 |
2650 if test "$window_system" != "none"; then | 2676 if test "$window_system" != "none"; then |
2651 AC_CHECKING(for graphics libraries) | 2677 AC_CHECKING(for graphics libraries) |
2652 | 2678 |
2653 dnl Autodetect Xpm | 2679 dnl Autodetect Xpm |
2680 xpm_problem="" | |
2654 if test -z "$with_xpm"; then | 2681 if test -z "$with_xpm"; then |
2655 AC_MSG_CHECKING(for Xpm - no older than 3.4f) | 2682 AC_MSG_CHECKING(for Xpm - no older than 3.4f) |
2656 xe_check_libs=-lXpm | 2683 xe_check_libs=-lXpm |
2657 AC_TRY_RUN([#include <X11/xpm.h> | 2684 AC_TRY_RUN([#include <X11/xpm.h> |
2658 int main(int c, char **v) { | 2685 int main(int c, char **v) { |
2659 return c == 1 ? 0 : | 2686 return c == 1 ? 0 : |
2660 XpmIncludeVersion != XpmLibraryVersion() ? 1 : | 2687 XpmIncludeVersion != XpmLibraryVersion() ? 1 : |
2661 XpmIncludeVersion < 30406 ? 2 : 0 ;}], | 2688 XpmIncludeVersion < 30406 ? 2 : 0 ;}], |
2662 [./conftest dummy_arg; xpm_status=$?; | 2689 [./conftest dummy_arg; xpm_status=$?; |
2663 if test "$?" = "0"; then | 2690 if test "$xpm_status" = "0"; then |
2664 with_xpm=yes; | 2691 with_xpm=yes; |
2665 else | 2692 else |
2666 with_xpm=no; | 2693 with_xpm=no; |
2667 if test "$?" = "1"; then | 2694 if test "$xpm_status" = "1"; then |
2668 xpm_problem="Xpm library version and header file version don't match!" | 2695 xpm_problem="Xpm library version and header file version don't match!" |
2669 elif test "$?" = "2"; then | 2696 elif test "$xpm_status" = "2"; then |
2670 xpm_problem="Xpm library version is too old!" | 2697 xpm_problem="Xpm library version is too old!" |
2671 else | 2698 else |
2672 xpm_problem="Internal xpm detection logic error!" | 2699 xpm_problem="Internal xpm detection logic error!" |
2673 fi | 2700 fi |
2674 echo " | 2701 echo " |
2675 *** WARNING *** $problem | 2702 *** WARNING *** $xpm_problem |
2676 I'm not touching that with a 10-foot pole! | 2703 I'm not touching that with a 10-foot pole! |
2677 If you really want to use the installed version of Xpm, rerun | 2704 If you really want to use the installed version of Xpm, rerun |
2678 configure --with-xpm=yes, but don't blame me if XEmacs crashes!" | 2705 configure and add '--with-xpm=yes', but don't blame me if XEmacs crashes!" |
2679 fi], | 2706 fi], |
2680 [with_xpm=no]) | 2707 [with_xpm=no]) |
2681 xe_check_libs= | 2708 xe_check_libs= |
2682 AC_MSG_RESULT($with_xpm) | 2709 AC_MSG_RESULT($with_xpm) |
2683 fi | 2710 fi |
2694 if test "$xpm_for_msw" = "yes"; then | 2721 if test "$xpm_for_msw" = "yes"; then |
2695 AC_DEFINE(FOR_MSW) | 2722 AC_DEFINE(FOR_MSW) |
2696 fi | 2723 fi |
2697 fi | 2724 fi |
2698 | 2725 |
2726 dnl For a brief period we had the GIF code split out into a separate library, | |
2727 dnl but patent problems, etc. sort of squashed that idea. | |
2728 dnl We default to building with builtin GIF decoding | |
2729 if test "$with_gif" != "no"; then | |
2730 with_gif="yes" | |
2731 AC_DEFINE(HAVE_GIF) | |
2732 XE_ADD_OBJS(dgif_lib.o gif_io.o) | |
2733 fi | |
2734 | |
2699 dnl Too many stupid linkers can't detect cascaded lib dependencies until runtime | 2735 dnl Too many stupid linkers can't detect cascaded lib dependencies until runtime |
2700 dnl So we always search for libz compression support. | 2736 dnl So we always search for libz compression support. |
2701 if test "$with_png $with_tiff" != "no no"; then | 2737 if test "$with_png $with_tiff" != "no no"; then |
2702 AC_CHECK_LIB(c, inflate, [:], [ | 2738 AC_CHECK_LIB(c, inflate, [:], [ |
2703 AC_CHECK_LIB(z, inflate, [XE_PREPEND(-lz, libs_x)],[ | 2739 AC_CHECK_LIB(z, inflate, [XE_PREPEND(-lz, libs_x)],[ |
2704 AC_CHECK_LIB(gz, inflate, [XE_PREPEND(-lgz, libs_x)])])]) | 2740 AC_CHECK_LIB(gz, inflate, [XE_PREPEND(-lgz, libs_x)])])]) |
2705 fi | |
2706 | |
2707 dnl Autodetect GIFlib | |
2708 AC_MSG_CHECKING(for gifreader) | |
2709 test -z "$with_gif" && { AC_CHECK_HEADER(gifrlib.h, ,with_gif=no) } | |
2710 test -z "$with_gif" && { AC_CHECK_LIB(gifreader, GetGifError,[:] ,with_gif=no) } | |
2711 test -z "$with_gif" && with_gif=yes | |
2712 if test "$with_gif" = "yes"; then | |
2713 AC_DEFINE(HAVE_GIF) | |
2714 XE_PREPEND(-lgifreader, libs_x) | |
2715 fi | 2741 fi |
2716 | 2742 |
2717 dnl autodetect JPEG | 2743 dnl autodetect JPEG |
2718 test -z "$with_jpeg" && { AC_CHECK_HEADER(jpeglib.h, ,with_jpeg=no) } | 2744 test -z "$with_jpeg" && { AC_CHECK_HEADER(jpeglib.h, ,with_jpeg=no) } |
2719 test -z "$with_jpeg" && { AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[:],with_jpeg=no) } | 2745 test -z "$with_jpeg" && { AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[:],with_jpeg=no) } |
2722 AC_DEFINE(HAVE_JPEG) | 2748 AC_DEFINE(HAVE_JPEG) |
2723 XE_PREPEND(-ljpeg, libs_x) | 2749 XE_PREPEND(-ljpeg, libs_x) |
2724 fi | 2750 fi |
2725 | 2751 |
2726 dnl autodetect PNG | 2752 dnl autodetect PNG |
2753 png_problem="" | |
2754 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } | |
2755 test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) } | |
2756 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } | |
2727 if test -z "$with_png"; then | 2757 if test -z "$with_png"; then |
2728 AC_MSG_CHECKING(for png.h - no older than 0.96) | 2758 AC_MSG_CHECKING(for workable png version information) |
2729 AC_EGREP_CPP(yes, | 2759 xe_check_libs="-lpng -lz" |
2730 [#include <png.h> | 2760 AC_TRY_RUN([#include <png.h> |
2731 #if PNG_LIBPNG_VER >= 96 | 2761 int main(int c, char **v) { |
2732 yes | 2762 if (c == 1) return 0; |
2733 #endif | 2763 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; |
2734 ], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); with_png=no]) | 2764 return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}], |
2735 fi | 2765 [./conftest dummy_arg; png_status=$?; |
2736 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } | 2766 if test "$png_status" = "0"; then |
2737 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } | 2767 with_png=yes; |
2738 test -z "$with_png" && with_png=yes | 2768 else |
2769 with_png=no; | |
2770 if test "$png_status" = "1"; then | |
2771 png_problem="PNG library version and header file don't match!" | |
2772 elif test "$png_status" = "2"; then | |
2773 png_problem="PNG library version too old (pre 1.0.2)!" | |
2774 fi | |
2775 echo " | |
2776 *** WARNING *** $png_problem | |
2777 I'm not touching that with a 10-foot pole! | |
2778 If you really want to use the installed version of libPNG, rerun | |
2779 configure and add '--with-png=yes', but don't blame me if XEmacs crashes!" | |
2780 fi], | |
2781 [with_png=no]) | |
2782 xe_check_libs= | |
2783 AC_MSG_RESULT($with_png) | |
2784 fi | |
2739 if test "$with_png" = "yes"; then | 2785 if test "$with_png" = "yes"; then |
2740 AC_DEFINE(HAVE_PNG) | 2786 AC_DEFINE(HAVE_PNG) |
2741 XE_PREPEND(-lpng, libs_x) | 2787 XE_PREPEND(-lpng, libs_x) |
2742 fi | 2788 fi |
2743 | 2789 |
2750 XE_PREPEND(-ltiff, libs_x) | 2796 XE_PREPEND(-ltiff, libs_x) |
2751 fi | 2797 fi |
2752 fi | 2798 fi |
2753 | 2799 |
2754 dnl ---------------------- | 2800 dnl ---------------------- |
2755 dnl Graphics libraries | 2801 dnl X-Specific Graphics libraries |
2756 dnl ---------------------- | 2802 dnl ---------------------- |
2757 | 2803 |
2758 if test "$with_x11" = "yes"; then | 2804 if test "$with_x11" = "yes"; then |
2759 | 2805 |
2760 AC_CHECKING(for X11 graphics libraries) | 2806 AC_CHECKING(for X11 graphics libraries) |
3179 return 1; | 3225 return 1; |
3180 }], have_mmap=yes, have_mmap=no) ;; | 3226 }], have_mmap=yes, have_mmap=no) ;; |
3181 esac | 3227 esac |
3182 AC_MSG_RESULT($have_mmap) | 3228 AC_MSG_RESULT($have_mmap) |
3183 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP) | 3229 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP) |
3230 AC_FUNC_MMAP | |
3184 | 3231 |
3185 dnl rel_alloc requires either GNU malloc or system malloc with mmap | 3232 dnl rel_alloc requires either GNU malloc or system malloc with mmap |
3186 dnl We only turn rel_alloc on by default if mmap is available. | 3233 dnl We only turn rel_alloc on by default if mmap is available. |
3187 test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no | 3234 test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no |
3188 test "$rel_alloc" = "default" -a "$have_mmap" = "yes" && rel_alloc=yes | 3235 test "$rel_alloc" = "default" -a "$have_mmap" = "yes" && rel_alloc=yes |
3465 #endif | 3512 #endif |
3466 #endif | 3513 #endif |
3467 #include <$path> | 3514 #include <$path> |
3468 ],[], db_h_path="$path"; break) | 3515 ],[], db_h_path="$path"; break) |
3469 done | 3516 done |
3470 if test -z "$db_h_path" | 3517 if test -z "$db_h_path" |
3471 then AC_MSG_RESULT(no); with_database_berkdb=no | 3518 then AC_MSG_RESULT(no); with_database_berkdb=no |
3472 else AC_MSG_RESULT($db_h_path) | 3519 else AC_MSG_RESULT($db_h_path) |
3473 fi | 3520 fi |
3474 | 3521 |
3475 if test "$with_database_berkdb" != "no"; then | 3522 if test "$with_database_berkdb" != "no"; then |
3621 echo "creating src/gdbinit"; echo "" | 3668 echo "creating src/gdbinit"; echo "" |
3622 echo "source $srcdir/src/gdbinit" > src/gdbinit | 3669 echo "source $srcdir/src/gdbinit" > src/gdbinit |
3623 fi | 3670 fi |
3624 | 3671 |
3625 dnl Create top level .sbinit for Sun compilers | 3672 dnl Create top level .sbinit for Sun compilers |
3626 if test "$__sunpro_c" = "yes"; then | 3673 if test "$__SUNPRO_C" = "yes"; then |
3627 echo "creating .sbinit"; echo "" | 3674 echo "creating .sbinit"; echo "" |
3628 ( echo "# For use with Sun WorkShop's Source browser." | 3675 ( echo "# For use with Sun WorkShop's Source browser." |
3629 echo "# See sbquery(1) and sbinit(4) for more information" | 3676 echo "# See sbquery(1) and sbinit(4) for more information" |
3630 for dir in $MAKE_SUBDIR; do echo "import $dir"; done | 3677 for dir in $MAKE_SUBDIR; do echo "import $dir"; done |
3631 ) > .sbinit | 3678 ) > .sbinit |
3897 if test "$with_xpm" = yes; then | 3944 if test "$with_xpm" = yes; then |
3898 echo " Compiling in support for XPM images." | 3945 echo " Compiling in support for XPM images." |
3899 elif test "$with_x11" = yes; then | 3946 elif test "$with_x11" = yes; then |
3900 echo " --------------------------------------------------------------------" | 3947 echo " --------------------------------------------------------------------" |
3901 echo " WARNING: Compiling without XPM support." | 3948 echo " WARNING: Compiling without XPM support." |
3902 echo " WARNING: You should strongly considering installing XPM." | 3949 if test "$xpm_problem" != ""; then |
3950 echo " Reason: $xpm_problem" | |
3951 fi | |
3952 echo " WARNING: You should strongly consider installing XPM." | |
3903 echo " WARNING: Otherwise toolbars and other graphics will look suboptimal." | 3953 echo " WARNING: Otherwise toolbars and other graphics will look suboptimal." |
3954 echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)" | |
3904 echo " --------------------------------------------------------------------" | 3955 echo " --------------------------------------------------------------------" |
3905 fi | 3956 fi |
3957 if test "$with_png" = yes; then | |
3958 echo " Compiling in support for PNG image handling." | |
3959 elif test "$window_system" != "none"; then | |
3960 echo " --------------------------------------------------------------------" | |
3961 echo " WARNING: Compiling without PNG image support." | |
3962 if test "$png_problem" != ""; then | |
3963 echo " Reason: $png_problem" | |
3964 fi | |
3965 echo " WARNING: You should strongly consider installing the PNG libraries." | |
3966 echo " WARNING: Otherwise certain images and glyphs may not display." | |
3967 echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)" | |
3968 echo " --------------------------------------------------------------------" | |
3969 fi | |
3970 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling." | |
3971 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling." | |
3972 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling." | |
3906 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." | 3973 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." |
3907 test "$with_gif" = yes && echo " Compiling in support for GIF image conversion." | |
3908 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image conversion." | |
3909 test "$with_png" = yes && echo " Compiling in support for PNG image conversion." | |
3910 test "$with_tiff" = yes && echo " Compiling in support for TIFF image conversion." | |
3911 case "$with_sound" in | 3974 case "$with_sound" in |
3912 nas ) echo " Compiling in network sound (NAS) support." ;; | 3975 nas ) echo " Compiling in network sound (NAS) support." ;; |
3913 native ) echo " Compiling in native sound support." ;; | 3976 native ) echo " Compiling in native sound support." ;; |
3914 both ) echo " Compiling in both network and native sound support." ;; | 3977 both ) echo " Compiling in both network and native sound support." ;; |
3915 esac | 3978 esac |