comparison configure.in @ 223:2c611d1463a6 r20-4b10

Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents 262b8bb4a523
children 12579d965149
comparison
equal deleted inserted replaced
222:aae4c8b01452 223:2c611d1463a6
1640 if test -z "$CFLAGS"; then 1640 if test -z "$CFLAGS"; then
1641 dnl Following values of CFLAGS are known to work well. 1641 dnl Following values of CFLAGS are known to work well.
1642 dnl Should we take debugging options into consideration? 1642 dnl Should we take debugging options into consideration?
1643 if test "$GCC" = "yes"; then 1643 if test "$GCC" = "yes"; then
1644 CFLAGS="-g -O2 -Wall -Wno-switch" 1644 CFLAGS="-g -O2 -Wall -Wno-switch"
1645 test "$opsys $machine" = "linux intel386" && \ 1645 dnl I'm not convinced this is a good idea any more. -sb
1646 CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2" 1646 dnl test "$opsys $machine" = "linux intel386" && \
1647 dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
1647 elif test "$__sunpro_c" = "yes"; then 1648 elif test "$__sunpro_c" = "yes"; then
1648 case "$opsys" in 1649 case "$opsys" in
1649 sol2 ) CFLAGS="-v -xO4" ;; 1650 sol2 ) CFLAGS="-v -xO4" ;;
1650 sunos4* ) CFLAGS="-xO2";; 1651 sunos4* ) CFLAGS="-xO2";;
1651 esac 1652 esac
2357 AC_DEFINE(HAVE_XFACE) 2358 AC_DEFINE(HAVE_XFACE)
2358 XE_PREPEND(-lcompface, libs_x) 2359 XE_PREPEND(-lcompface, libs_x)
2359 fi 2360 fi
2360 2361
2361 dnl autodetect ImageMagick 2362 dnl autodetect ImageMagick
2362 test -z "$with_imagick" && { AC_CHECK_HEADER(magick/magick.h, ,with_imagick=no) } 2363 test -z "$with_imagick" && { AC_CHECK_HEADER(magick/magick.h, ,AC_CHECK_HEADER(X11/magick/magick.h,AC_DEFINE(MAGICK_HEADERS_ARE_UNDER_X11),with_imagick=no)) }
2363 test -z "$with_imagick" && { 2364 test -z "$with_imagick" && {
2364 dnl check the appropriate libraries for ImageMagick 2365 dnl check the appropriate libraries for ImageMagick
2365 imagick_libs="" 2366 imagick_libs=""
2366 AC_CHECK_LIB(dps, XDPSPixelsPerPoint, XE_APPEND(-ldpstk -ldps, imagick_libs),,,-ldpstk) 2367 AC_CHECK_LIB(dps, XDPSPixelsPerPoint, XE_APPEND(-ldpstk -ldps, imagick_libs),,,-ldpstk)
2367 AC_CHECK_LIB(fpx, FPX_SetToolkitMemoryLimit, XE_APPEND(-lfpx, imagick_libs)) 2368 AC_CHECK_LIB(fpx, FPX_SetToolkitMemoryLimit, XE_APPEND(-lfpx, imagick_libs))
2368 AC_CHECK_LIB(df, DF24getdims, XE_APPEND(-ldf, imagick_libs)) 2369 AC_CHECK_LIB(df, DF24getdims, XE_APPEND(-ldf, imagick_libs))
2369 AC_CHECK_LIB(jbig, jbg_dec_init, XE_APPEND(-ljbig, imagick_libs)) 2370 AC_CHECK_LIB(jbig, jbg_dec_init, XE_APPEND(-ljbig, imagick_libs))
2370 AC_CHECK_LIB(jpeg, jpeg_read_header, XE_APPEND(-ljpeg, imagick_libs)) 2371 AC_CHECK_LIB(jpeg, jpeg_read_header, XE_APPEND(-ljpeg, imagick_libs))
2371 AC_CHECK_LIB(mpeg, OpenMPEG, XE_APPEND(-lmpeg, imagick_libs)) 2372 AC_CHECK_LIB(mpeg, OpenMPEG, XE_APPEND(-lmpeg, imagick_libs))
2373 AC_CHECK_LIB(ttf, TT_Init_FreeType, XE_APPEND(-lttf, imagick_libs))
2372 AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng, imagick_libs), 2374 AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng, imagick_libs),
2373 AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng -lz, imagick_libs),,-lz)) 2375 AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng -lz, imagick_libs),,-lz))
2374 AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff, imagick_libs), 2376 AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff, imagick_libs),
2375 AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff -ljpeg -lz, imagick_libs),,-ljpeg -lz)) 2377 AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff -ljpeg -lz, imagick_libs),,-ljpeg -lz))
2376 XE_APPEND($imagick_libs, libs_x) 2378 XE_APPEND($imagick_libs, libs_x)