head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2; locks; strict; comment @# @; 1.3 date 2002.09.22.00.08.20; author jlam; state dead; branches; next 1.2; 1.2 date 2002.01.03.14.03.02; author wiz; state Exp; branches; next 1.1; 1.1 date 2001.08.23.21.32.18; author jlam; state Exp; branches; next ; desc @@ 1.3 log @buildlink1 -> buildlink2 @ text @$NetBSD: patch-ab,v 1.2 2002/01/03 14:03:02 wiz Exp $ --- configure.orig Mon Dec 24 11:57:35 2001 +++ configure @@@@ -1152,9 +1152,9 @@@@ echo "$ac_t""no" 1>&6 fi - if test "x$MAGICK_CONFIG" = "xMagick-config" ; then + if test "x$MAGICK_CONFIG" != "x" ; then CPPFLAGS_BACKUP="$CPPFLAGS" - CPPFLAGS=`Magick-config --cppflags` + CPPFLAGS=`$MAGICK_CONFIG --cppflags` ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for magick/api.h""... $ac_c" 1>&6 echo "configure:1161: checking for magick/api.h" >&5 @@@@ -1192,10 +1192,10 @@@@ MAGICK_CFLAGS=${CPPFLAGS} CPPFLAGS=${CPPFLAGS_BACKUP} if test "x${magick_header_found}" = xyes ; then - MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`" + MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`" echo $ac_n "checking ImageMagick - version >= 5.2.1""... $ac_c" 1>&6 echo "configure:1198: checking ImageMagick - version >= 5.2.1" >&5 - MAGICK_VERSION=`Magick-config --version` + MAGICK_VERSION=`$MAGICK_CONFIG --version` MAGICK_MAJOR_VERSION=`echo $MAGICK_VERSION \ | sed -e "s/^\([0-9]*\).[0-9]*.[0-9]*$/\1/"` MAGICK_MINOR_VERSION=`echo $MAGICK_VERSION \ @ 1.2 log @Update to 0.29. Changes since 0.26: version 0.29 (Fixes the lowercase/uppercase problems, fix for swf export, new MIF and CGM export, code rearrangements) version 0.28 (Several bugfixes, Progress bar, Cancel point, Efforts to make libautotrace.a thread-safe, Clean up library name space (all exported symbols have "at_" prefix), DXF, EPD and PDF export, Despeckling filter) version 0.27a (Fixed a compilation problem) version 0.27 (Parts of the code were rearranged, fixed a bug in color quantization, centerline support, Elastic Reality output, now works with new versions of ImageMagick, swf output (via libming), dxf output was removed because it never worked, speed up and simplification of the fitting routine) Should also fix bulk build failure. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Use ${MAGICK_CONFIG} instead of Magick-config. @ text @d3 1 a3 1 --- configure.orig Wed Nov 15 12:11:09 2000 d5 1 a5 1 @@@@ -1139,9 +1139,9 @@@@ d9 6 a14 6 -if test "x$MAGICK_CONFIG" = "xMagick-config" ; then +if test "x$MAGICK_CONFIG" != "x" ; then CPPFLAGS_BACKUP="$CPPFLAGS" - CPPFLAGS=`Magick-config --cppflags` + CPPFLAGS=`$MAGICK_CONFIG --cppflags` ac_safe=`echo "magick/api.h" | sed 'y%./+-%__p_%'` d16 14 a29 10 echo "configure:1148: checking for magick/api.h" >&5 @@@@ -1180,7 +1180,7 @@@@ CPPFLAGS=${CPPFLAGS_BACKUP} if test "x${magick_header_found}" = xyes ; then - MAGICK_LDFLAGS="`Magick-config --ldflags` `Magick-config --libs`" + MAGICK_LDFLAGS="`$MAGICK_CONFIG --ldflags` `$MAGICK_CONFIG --libs`" HAVE_MAGICK=yes @