diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-16 19:56:16 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-16 19:56:16 +0000 |
commit | 1de57759e15427ef24cb2518bc3fb2cb888ea34a (patch) | |
tree | a045fe0b632fa05af4104afa5a03796fcf28d6f4 /graphics/imlib | |
parent | 8bd2534b148e31be92dcab30499ac421b274ef91 (diff) | |
download | pkgsrc-1de57759e15427ef24cb2518bc3fb2cb888ea34a.tar.gz |
Refer to glib-config as $GLIB_CONFIG in configure script, and add X_LDFLAGS
variable for X libraries linker flags.
Diffstat (limited to 'graphics/imlib')
-rw-r--r-- | graphics/imlib/patches/patch-ad | 132 |
1 files changed, 49 insertions, 83 deletions
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad index 570562a718e..1fa06277a0e 100644 --- a/graphics/imlib/patches/patch-ad +++ b/graphics/imlib/patches/patch-ad @@ -1,88 +1,54 @@ -$NetBSD: patch-ad,v 1.3 2001/03/10 13:04:08 wiz Exp $ +$NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam 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) +--- configure.in.orig Sat May 20 02:24:10 2000 ++++ configure.in Fri Jun 15 22:52:42 2001 +@@ -34,6 +34,8 @@ + fi + ]) --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(GLIB_CONFIG, glib-config, no) ++ + dynworks=false + if test x$with_modules = xno; then + AC_MSG_RESULT(no) +@@ -43,8 +45,8 @@ + if test "x$GDK_IMLIB" != x; then + oLIBS="$LIBS" + oCFLAGS="$CFLAGS" +- LIBS="$LIBS `glib-config --libs gmodule`" +- CFLAGS="$CFLAGS `glib-config --cflags gmodule`" ++ LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`" ++ CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`" + AC_TRY_RUN([ + #include <glib.h> + #include <gmodule.h> +@@ -76,8 +78,8 @@ - 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 + if $dynworks; then + AC_DEFINE(USE_GMODULE) +- GMODULE_LIBS="`glib-config --libs gmodule`" +- GMODULE_FLAGS="`glib-config --cflags gmodule`" ++ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" ++ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" + AC_SUBST(GMODULE_LIBS) + AC_SUBST(GMODULE_FLAGS) + AC_MSG_RESULT(yes) +@@ -157,7 +159,9 @@ + GX_LIBS="$GTK_LIBS" + 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 +-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" ++if test -z "$X_LDFLAGS"; then ++ X_LDFLAGS= ++fi - dnl If we HAVE libpng at all, we make this check :) - #if test "$png_ok" = yes; then + SUPPORT_LIBS="" + +@@ -338,6 +342,7 @@ + AC_SUBST(CPPFLAGS) + AC_SUBST(X_CFLAGS) + AC_SUBST(LDFLAGS) ++AC_SUBST(X_LDFLAGS) + AC_SUBST(X_PRE_LIBS) + AC_SUBST(X_LIBS) + AC_SUBST(X_EXTRA_LIBS) |