diff options
| author | wiz <wiz@pkgsrc.org> | 2001-03-10 13:04:07 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-03-10 13:04:07 +0000 |
| commit | 4342a6c22e2d0d6313fc60385dad561e5d61bed6 (patch) | |
| tree | 11ba79d3e52d6ffdd037b2715efff5eb2c4ffde7 /graphics/imlib/patches | |
| parent | ad6a1ff3a115ad123c15b8686e13c08897fde2e7 (diff) | |
| download | pkgsrc-4342a6c22e2d0d6313fc60385dad561e5d61bed6.tar.gz | |
Fix path for convert and other ImageMagick tools. Addresses pkg/11313.
Also comment out broken parts of libpng and libjpeg tests (though it
doesn't seem to change much).
Diffstat (limited to 'graphics/imlib/patches')
| -rw-r--r-- | graphics/imlib/patches/patch-ad | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad new file mode 100644 index 00000000000..570562a718e --- /dev/null +++ b/graphics/imlib/patches/patch-ad @@ -0,0 +1,88 @@ +$NetBSD: patch-ad,v 1.3 2001/03/10 13:04:08 wiz Exp $ + +--- configure.in.orig Sat May 20 08:24:10 2000 ++++ configure.in +@@ -98,10 +98,12 @@ + AC_PATH_PROG(DJPEG_PROG, djpeg) + AC_PATH_PROG(CJPEG_PROG, cjpeg) + +-AC_PATH_PROG(CONVERT_PROG, convert) +-echo "CONVERT_PROG is $CONVERT_PROG" +-CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'` +-echo "CONVERT_PATH is $CONVERT_PATH" ++#AC_PATH_PROG(CONVERT_PROG, convert) ++#echo "CONVERT_PROG is $CONVERT_PROG" ++#CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'` ++#echo "CONVERT_PATH is $CONVERT_PATH" ++echo "overriding CONVERT_PATH=@LOCALBASE@/bin" ++CONVERT_PATH=@LOCALBASE@/bin + AC_SUBST(CONVERT_PATH) + + AC_PATH_PROG(GIFTOPNM_PROG, giftopnm) +@@ -228,23 +230,23 @@ + jpeg_ok=yes, + jpeg_ok=no + AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), $GX_LIBS) +-if test "$jpeg_ok" = yes; then +- AC_MSG_CHECKING([for jpeglib.h]) +- AC_TRY_CPP( +-[#include <stdio.h> ++#if test "$jpeg_ok" = yes; then ++# AC_MSG_CHECKING([for jpeglib.h]) ++# AC_TRY_CPP( ++#[#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <jpeglib.h>], +- jpeg_ok=yes, +- jpeg_ok=no) +- AC_MSG_RESULT($jpeg_ok) ++# jpeg_ok=yes, ++# jpeg_ok=no) ++# AC_MSG_RESULT($jpeg_ok) + if test "$jpeg_ok" = yes; then + JPEGLIBS="-ljpeg" + SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; AC_DEFINE(HAVE_LIBJPEG) + else + AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***) + fi +-fi ++#fi + + dnl Test for libtiff + AC_CHECK_LIB(tiff, TIFFReadScanline, +@@ -284,20 +286,20 @@ + png_ok=yes, + png_ok=no), + AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), -lz -lm $GX_LIBS) +-if test "$png_ok" = yes; then +- AC_MSG_CHECKING([for png_structp in png.h]) +- AC_TRY_COMPILE([#include <png.h>], +- [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct +-; png_set_IHDR;], +- png_ok=yes, +- png_ok=no) +- AC_MSG_RESULT($png_ok) +- if test "$png_ok" = no; then +- AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***) +- fi +-else +- AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) +-fi ++#if test "$png_ok" = yes; then ++# AC_MSG_CHECKING([for png_structp in png.h]) ++# AC_TRY_COMPILE([#include <png.h>], ++# [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct ++#; png_set_IHDR;], ++# png_ok=yes, ++# png_ok=no) ++# AC_MSG_RESULT($png_ok) ++# if test "$png_ok" = no; then ++# AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***) ++# fi ++#else ++# AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) ++#fi + + dnl If we HAVE libpng at all, we make this check :) + #if test "$png_ok" = yes; then |