diff options
Diffstat (limited to 'graphics/libgdiplus/patches/patch-ac')
| -rw-r--r-- | graphics/libgdiplus/patches/patch-ac | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac index e5fe71a41b2..7a77b1cb0e5 100644 --- a/graphics/libgdiplus/patches/patch-ac +++ b/graphics/libgdiplus/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.3 2004/08/27 22:04:45 recht Exp $ +$NetBSD: patch-ac,v 1.4 2005/03/27 10:29:20 recht Exp $ ---- configure.in.orig 2004-08-27 22:37:25.000000000 +0200 -+++ configure.in 2004-08-27 22:38:39.000000000 +0200 -@@ -6,24 +6,25 @@ - AM_MAINTAINER_MODE - AM_PROG_LIBTOOL +--- configure.in.orig Fri Mar 25 17:39:38 2005 ++++ configure.in +@@ -8,11 +8,12 @@ AM_PROG_LIBTOOL + + AC_C_BIGENDIAN +AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -16,19 +16,27 @@ $NetBSD: patch-ac,v 1.3 2004/08/27 22:04:45 recht Exp $ echo GLIB 2.0 installation OK else AC_MSG_ERROR("Did not find Glib >= 2.2.3"); - fi - --if pkg-config --atleast-version 0.1.22 cairo; then -+if $PKG_CONFIG --atleast-version 0.1.22 cairo; then - echo Cairo installation OK +@@ -31,18 +32,18 @@ then + CAIRO_CFLAGS='-I$(top_srcdir)/libpixman/src -I$(top_srcdir)/cairo/src' + AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus]) else - AC_MSG_ERROR("Did not find Cairo 0.1.22"); +- if pkg-config --exact-version 0.3.0 cairo; then ++ if $PKG_CONFIG --exact-version 0.3.0 cairo; then + echo Cairo installation OK + else + AC_MSG_ERROR("Did not find Cairo == 0.3.0"); + fi + +- CAIRO_LIBS="`pkg-config --libs cairo`" +- CAIRO_CFLAGS="`pkg-config --cflags cairo`" ++ CAIRO_LIBS="`$PKG_CONFIG --libs cairo`" ++ CAIRO_CFLAGS="`$PKG_CONFIG --cflags cairo`" fi --GDIPLUS_LIBS="`pkg-config --libs cairo glib-2.0 ` `freetype-config --libs`" --GDIPLUS_CFLAGS="`pkg-config --cflags cairo glib-2.0 ` `freetype-config --cflags`" -+GDIPLUS_LIBS="`$PKG_CONFIG --libs cairo glib-2.0 ` `$FREETYPE_CONFIG --libs`" -+GDIPLUS_CFLAGS="`$PKG_CONFIG --cflags cairo glib-2.0 ` `$FREETYPE_CONFIG --cflags`" +-GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`" +-GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `freetype-config --cflags`" ++GDIPLUS_LIBS="$CAIRO_LIBS `$PKG_CONFIG --libs glib-2.0 ` `freetype-config --libs`" ++GDIPLUS_CFLAGS="$CAIRO_CFLAGS `$PKG_CONFIG --cflags glib-2.0 ` `freetype-config --cflags`" + AC_CHECK_HEADERS(byteswap.h) - AC_MSG_CHECKING([host threading settings]) |