Mercurial > hg > xemacs-beta

comparison configure.in @ 310:851ff35f137f r21-0b53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b53
author cvs
date Mon, 13 Aug 2007 10:43:28 +0200
parents 33bdb3d4b97f
children 512e409c26a2
comparison
equal deleted inserted replaced
309:7f3a3eb0558c 310:851ff35f137f
2675 2675
2676 if test "$window_system" != "none"; then 2676 if test "$window_system" != "none"; then
2677 AC_CHECKING(for graphics libraries) 2677 AC_CHECKING(for graphics libraries)
2678 2678
2679 dnl Autodetect Xpm 2679 dnl Autodetect Xpm
2680 xpm_problem=""
2680 if test -z "$with_xpm"; then 2681 if test -z "$with_xpm"; then
2681 AC_MSG_CHECKING(for Xpm - no older than 3.4f) 2682 AC_MSG_CHECKING(for Xpm - no older than 3.4f)
2682 xe_check_libs=-lXpm 2683 xe_check_libs=-lXpm
2683 AC_TRY_RUN([#include <X11/xpm.h> 2684 AC_TRY_RUN([#include <X11/xpm.h>
2684 int main(int c, char **v) { 2685 int main(int c, char **v) {
2685 return c == 1 ? 0 : 2686 return c == 1 ? 0 :
2686 XpmIncludeVersion != XpmLibraryVersion() ? 1 : 2687 XpmIncludeVersion != XpmLibraryVersion() ? 1 :
2687 XpmIncludeVersion < 30406 ? 2 : 0 ;}], 2688 XpmIncludeVersion < 30406 ? 2 : 0 ;}],
2688 [./conftest dummy_arg; xpm_status=$?; 2689 [./conftest dummy_arg; xpm_status=$?;
2689 if test "$?" = "0"; then 2690 if test "$xpm_status" = "0"; then
2690 with_xpm=yes; 2691 with_xpm=yes;
2691 else 2692 else
2692 with_xpm=no; 2693 with_xpm=no;
2693 if test "$?" = "1"; then 2694 if test "$xpm_status" = "1"; then
2694 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!"
2695 elif test "$?" = "2"; then 2696 elif test "$xpm_status" = "2"; then
2696 xpm_problem="Xpm library version is too old!" 2697 xpm_problem="Xpm library version is too old!"
2697 else 2698 else
2698 xpm_problem="Internal xpm detection logic error!" 2699 xpm_problem="Internal xpm detection logic error!"
2699 fi 2700 fi
2700 echo " 2701 echo "
2701 *** WARNING *** $problem 2702 *** WARNING *** $xpm_problem
2702 I'm not touching that with a 10-foot pole! 2703 I'm not touching that with a 10-foot pole!
2703 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
2704 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!"
2705 fi], 2706 fi],
2706 [with_xpm=no]) 2707 [with_xpm=no])
2707 xe_check_libs= 2708 xe_check_libs=
2708 AC_MSG_RESULT($with_xpm) 2709 AC_MSG_RESULT($with_xpm)
2709 fi 2710 fi
2747 AC_DEFINE(HAVE_JPEG) 2748 AC_DEFINE(HAVE_JPEG)
2748 XE_PREPEND(-ljpeg, libs_x) 2749 XE_PREPEND(-ljpeg, libs_x)
2749 fi 2750 fi
2750 2751
2751 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) }
2752 if test -z "$with_png"; then 2757 if test -z "$with_png"; then
2753 AC_MSG_CHECKING(for png.h - no older than 1.02) 2758 AC_MSG_CHECKING(for workable png version information)
2754 AC_EGREP_CPP(yes, 2759 xe_check_libs="-lpng -lz"
2755 [#include <png.h> 2760 AC_TRY_RUN([#include <png.h>
2756 #if PNG_LIBPNG_VER >= 10002 2761 int main(int c, char **v) {
2757 yes 2762 if (c == 1) return 0;
2758 #endif 2763 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
2759 ], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); with_png=no]) 2764 return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}],
2760 fi 2765 [./conftest dummy_arg; png_status=$?;
2761 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } 2766 if test "$png_status" = "0"; then
2762 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } 2767 with_png=yes;
2763 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
2764 if test "$with_png" = "yes"; then 2785 if test "$with_png" = "yes"; then
2765 AC_DEFINE(HAVE_PNG) 2786 AC_DEFINE(HAVE_PNG)
2766 XE_PREPEND(-lpng, libs_x) 2787 XE_PREPEND(-lpng, libs_x)
2767 fi 2788 fi
2768 2789
3922 if test "$with_xpm" = yes; then 3943 if test "$with_xpm" = yes; then
3923 echo " Compiling in support for XPM images." 3944 echo " Compiling in support for XPM images."
3924 elif test "$with_x11" = yes; then 3945 elif test "$with_x11" = yes; then
3925 echo " --------------------------------------------------------------------" 3946 echo " --------------------------------------------------------------------"
3926 echo " WARNING: Compiling without XPM support." 3947 echo " WARNING: Compiling without XPM support."
3948 if test "$xpm_problem" != ""; then
3949 echo " Reason: $xpm_problem"
3950 fi
3927 echo " WARNING: You should strongly consider installing XPM." 3951 echo " WARNING: You should strongly consider installing XPM."
3928 echo " WARNING: Otherwise toolbars and other graphics will look suboptimal." 3952 echo " WARNING: Otherwise toolbars and other graphics will look suboptimal."
3929 echo " WARNING: (a copy may be found at ftp://ftp.xemacs.org/pub/xemacs/aux)" 3953 echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
3930 echo " --------------------------------------------------------------------" 3954 echo " --------------------------------------------------------------------"
3931 fi 3955 fi
3932 if test "$with_png" = yes; then 3956 if test "$with_png" = yes; then
3933 echo " Compiling in support for PNG image handling." 3957 echo " Compiling in support for PNG image handling."
3934 else 3958 elif test "$window_system" != "none"; then
3935 echo " --------------------------------------------------------------------" 3959 echo " --------------------------------------------------------------------"
3936 echo " WARNING: Compiling without PNG image support." 3960 echo " WARNING: Compiling without PNG image support."
3961 if test "$png_problem" != ""; then
3962 echo " Reason: $png_problem"
3963 fi
3937 echo " WARNING: You should strongly consider installing the PNG libraries." 3964 echo " WARNING: You should strongly consider installing the PNG libraries."
3938 echo " WARNING: Otherwise certain images and glyphs may not display." 3965 echo " WARNING: Otherwise certain images and glyphs may not display."
3939 echo " WARNING: (a copy may be found at ftp://ftp.xemacs.org/pub/xemacs/aux)" 3966 echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
3940 echo " --------------------------------------------------------------------" 3967 echo " --------------------------------------------------------------------"
3941 fi 3968 fi
3942 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers."
3943 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling." 3969 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling."
3944 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling." 3970 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling."
3945 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling." 3971 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling."
3972 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers."
3946 case "$with_sound" in 3973 case "$with_sound" in
3947 nas ) echo " Compiling in network sound (NAS) support." ;; 3974 nas ) echo " Compiling in network sound (NAS) support." ;;
3948 native ) echo " Compiling in native sound support." ;; 3975 native ) echo " Compiling in native sound support." ;;
3949 both ) echo " Compiling in both network and native sound support." ;; 3976 both ) echo " Compiling in both network and native sound support." ;;
3950 esac 3977 esac