Use buildlink2.

Reduce configure's patch size with pkgdiff.
Install documentation files in $PREFIX/share/doc/{,html/}pstoedit.
Install one file at a time.

Bump PKGREVISION.

4 files changed, 33 insertions, 911 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index e6bb652ef1a..f4952b2aff0 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:41:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/06 23:03:10 seb Exp $
 
 DISTNAME=	pstoedit_3_31
 PKGNAME=	pstoedit-3.31
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/pstoedit_3.31/src
 CATEGORIES=	converters graphics print
 MASTER_SITES=	http://home.t-online.de/home/helga.glunz/wglunz/pstoedit/
@@ -11,14 +12,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.pstoedit.net/
 COMMENT=	Convert PostScript / PDF into various vector graphic formats
 
-# Requires C++ support of plotutils.
-DEPENDS+=	plotutils>=2.4.1:../../graphics/plotutils
-
 RESTRICTED?=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_X11=	yes
 USE_LIBTOOL=	yes
+USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBTOOL="${LIBTOOL}" LIBPLOTTERLA="${X11PREFIX}/lib/libplotter.la"
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
@@ -26,18 +26,25 @@ CONFIGURE_ENV+=	LDLIBS="${X11_LDFLAGS}"
 CONFIGURE_ENV+=	AWK=${AWK} GS=${LOCALBASE}/bin/gs
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit	# plugin dir -- unused for now
+LDFLAGS+=	-L${BUILDLINK_PREFIX.plotutils}/lib
+CXXFLAGS+=	-I${BUILDLINK_PREFIX.plotutils}/include
 ALL_TARGET=
 
 post-extract:
 	cd ${WRKSRC} && ${LN} ../config/* .
 
-DOCDIR=		${PREFIX}/share/pstoedit/doc
+DOCDIR=		${PREFIX}/share/doc/pstoedit
+HTMLDIR=	${PREFIX}/share/doc/html/pstoedit
 DOCSRC=		${WRKSRC}/..
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${DOCSRC}/*.htm		${DOCDIR}
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	for f in ${DOCSRC}/*.htm; do			\
+	   ${INSTALL_DATA} $${f}	${HTMLDIR};	\
+	done
 	${INSTALL_DATA} ${DOCSRC}/readme.txt	${DOCDIR}
 
+.include "../../graphics/plotutils/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 2481acf019d..93313c77227 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/07 13:18:26 itohy Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/06 23:03:10 seb Exp $
 bin/pstoedit
 man/man1/pstoedit.1
-share/pstoedit/doc/changelog.htm
-share/pstoedit/doc/index.htm
-share/pstoedit/doc/pstoedit.htm
-share/pstoedit/doc/readme.txt
-@dirrm share/pstoedit/doc
+share/doc/html/pstoedit/changelog.htm
+share/doc/html/pstoedit/index.htm
+share/doc/html/pstoedit/pstoedit.htm
+share/doc/pstoedit/readme.txt
 share/pstoedit/latex2e.fmp
 share/pstoedit/mpost.fmp
 share/pstoedit/pstoedit.htm
@@ -13,3 +12,5 @@ share/pstoedit/svg.fmp
 share/pstoedit/swffonts/default.fdb
 @dirrm share/pstoedit/swffonts
 @dirrm share/pstoedit
+@dirrm share/doc/pstoedit
+@dirrm share/doc/html/pstoedit
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index b129deeb491..feea29a8d6b 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/07/02 12:52:43 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/05/06 23:03:11 seb Exp $
 
 SHA1 (pstoedit_3_31.zip) = 95e7a09385c3d9ce3dbe8ba5afcc9154021c83ce
 Size (pstoedit_3_31.zip) = 558546 bytes
 SHA1 (patch-aa) = 25513e3452eed6eb464df1c0dbeeafa4d0f446bf
-SHA1 (patch-ab) = 12ecc8f993e3702018267238c7ea5234a38f1482
+SHA1 (patch-ab) = c96f64f0bf26ebbd4b119bf1f6da426421b22537
 SHA1 (patch-ac) = 614ba9036e1484755955b765e829227e64f10879
 SHA1 (patch-ad) = 3b01b11422db35a95b1a55a20c7a28dc3a251fa9
diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab
index eabecfaaeb0..c582e7bdf58 100644
--- a/graphics/pstoedit/patches/patch-ab
+++ b/graphics/pstoedit/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
+$NetBSD: patch-ab,v 1.3 2003/05/06 23:03:11 seb Exp $
 
---- configure.orig	Fri Mar 22 10:14:43 2002
-+++ configure	Fri Mar 22 10:18:52 2002
-@@ -618,6 +618,10 @@
+--- configure.orig	2003-05-06 21:14:14.000000000 +0000
++++ configure
+@@ -618,6 +618,10 @@ EOF
  
    cat <<\EOF
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  System types:
    --build=BUILD     configure for building on BUILD [guessed]
    --host=HOST       build programs to run on HOST [BUILD]
-@@ -635,6 +639,11 @@
+@@ -635,6 +639,11 @@ Optional Features:
                            Wrap (i.e. prefix) compiler invocations with PROGRAM
                            (e.g. \"insure\" or \"purify\")
  
@@ -25,128 +25,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  Some influential environment variables:
    CXX         C++ compiler command
    CXXFLAGS    C++ compiler flags
-@@ -827,7 +836,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:830: loading site script $ac_site_file" >&5
-+    { echo "$as_me:839: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-     cat "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -838,7 +847,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:841: loading cache $cache_file" >&5
-+    { echo "$as_me:850: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -846,7 +855,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:849: creating cache $cache_file" >&5
-+  { echo "$as_me:858: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -862,21 +871,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:865: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:874: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:869: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:878: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:875: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:884: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:877:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:886:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:879:   current value: $ac_new_val" >&5
-+        { echo "$as_me:888:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -895,9 +904,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:898: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:907: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:900: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:909: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -917,10 +926,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:920: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:929: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:923: \$? = $ac_status" >&5
-+  echo "$as_me:932: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -946,7 +955,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:949: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:958: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -956,11 +965,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:959: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:968: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:963: checking build system type" >&5
-+echo "$as_me:972: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -969,26 +978,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:972: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:981: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:976: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:985: error: $ac_config_sub $ac_cv_build_alias failed." >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:981: result: $ac_cv_build" >&5
-+echo "$as_me:990: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -985,10 +994,7 @@ build_cpu=`echo $ac_cv_build | sed 's/^\
  build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
@@ -158,21 +37,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  echo $ECHO_N "checking host system type... $ECHO_C" >&6
  if test "${ac_cv_host+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -997,21 +1003,18 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:1000: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1006: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1005: result: $ac_cv_host" >&5
-+echo "$as_me:1011: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1009,9 +1015,6 @@ host_cpu=`echo $ac_cv_host | sed 's/^\([
  host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
@@ -182,476 +47,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -1022,7 +1025,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1025: checking for $ac_word" >&5
-+echo "$as_me:1028: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1037,7 +1040,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:1040: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1043: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1045,10 +1048,10 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:1048: result: $AWK" >&5
-+  echo "$as_me:1051: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:1051: result: no" >&5
-+  echo "$as_me:1054: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1065,7 +1068,7 @@
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:1068: checking for $ac_word" >&5
-+echo "$as_me:1071: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1080,7 +1083,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--echo "$as_me:1083: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1086: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1088,10 +1091,10 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:1091: result: $CXX" >&5
-+  echo "$as_me:1094: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:1094: result: no" >&5
-+  echo "$as_me:1097: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1104,7 +1107,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1107: checking for $ac_word" >&5
-+echo "$as_me:1110: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1119,7 +1122,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CXX="$ac_prog"
--echo "$as_me:1122: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1125: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1127,10 +1130,10 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:1130: result: $ac_ct_CXX" >&5
-+  echo "$as_me:1133: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6
- else
--  echo "$as_me:1133: result: no" >&5
-+  echo "$as_me:1136: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1142,27 +1145,27 @@
- fi
- 
- # Provide some information about the compiler.
--echo "$as_me:1145:" \
-+echo "$as_me:1148:" \
-      "checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1148: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1151: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1151: \$? = $ac_status" >&5
-+  echo "$as_me:1154: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1153: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1156: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1156: \$? = $ac_status" >&5
-+  echo "$as_me:1159: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1158: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1161: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1161: \$? = $ac_status" >&5
-+  echo "$as_me:1164: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1165 "configure"
-+#line 1168 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1178,13 +1181,13 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:1181: checking for C++ compiler default output" >&5
-+echo "$as_me:1184: checking for C++ compiler default output" >&5
- echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1184: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1187: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1187: \$? = $ac_status" >&5
-+  echo "$as_me:1190: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1207,34 +1210,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1210: error: C++ compiler cannot create executables" >&5
-+{ { echo "$as_me:1213: error: C++ compiler cannot create executables" >&5
- echo "$as_me: error: C++ compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1216: result: $ac_file" >&5
-+echo "$as_me:1219: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1221: checking whether the C++ compiler works" >&5
-+echo "$as_me:1224: checking whether the C++ compiler works" >&5
- echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1230: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1230: \$? = $ac_status" >&5
-+  echo "$as_me:1233: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1237: error: cannot run C++ compiled programs.
-+	{ { echo "$as_me:1240: error: cannot run C++ compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C++ compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1242,24 +1245,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1245: result: yes" >&5
-+echo "$as_me:1248: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1252: checking whether we are cross compiling" >&5
-+echo "$as_me:1255: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1254: result: $cross_compiling" >&5
-+echo "$as_me:1257: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1257: checking for executable suffix" >&5
-+echo "$as_me:1260: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1259: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1262: \$? = $ac_status" >&5
-+  echo "$as_me:1265: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1275,25 +1278,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1278: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1281: error: cannot compute EXEEXT: cannot compile and link" >&5
- echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1284: result: $ac_cv_exeext" >&5
-+echo "$as_me:1287: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1290: checking for object suffix" >&5
-+echo "$as_me:1293: checking for object suffix" >&5
- echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1296 "configure"
-+#line 1299 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1305,10 +1308,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1308: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1311: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1311: \$? = $ac_status" >&5
-+  echo "$as_me:1314: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
-@@ -1320,24 +1323,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1323: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1326: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1330: result: $ac_cv_objext" >&5
-+echo "$as_me:1333: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1334: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:1337: checking whether we are using the GNU C++ compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1340 "configure"
-+#line 1343 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1352,16 +1355,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1358: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1358: \$? = $ac_status" >&5
-+  echo "$as_me:1361: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1364: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1364: \$? = $ac_status" >&5
-+  echo "$as_me:1367: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1373,19 +1376,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1376: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:1379: result: $ac_cv_cxx_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="-g"
--echo "$as_me:1382: checking whether $CXX accepts -g" >&5
-+echo "$as_me:1385: checking whether $CXX accepts -g" >&5
- echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1388 "configure"
-+#line 1391 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1397,16 +1400,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1403: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1403: \$? = $ac_status" >&5
-+  echo "$as_me:1406: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1409: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1409: \$? = $ac_status" >&5
-+  echo "$as_me:1412: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cxx_g=yes
- else
-@@ -1416,7 +1419,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1419: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:1422: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
-@@ -1443,7 +1446,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1446 "configure"
-+#line 1449 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -1456,16 +1459,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1459: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1462: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1462: \$? = $ac_status" >&5
-+  echo "$as_me:1465: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1465: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1468: \$? = $ac_status" >&5
-+  echo "$as_me:1471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1475,7 +1478,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1478 "configure"
-+#line 1481 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1487,16 +1490,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1490: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1493: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1493: \$? = $ac_status" >&5
-+  echo "$as_me:1496: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1496: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1499: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1499: \$? = $ac_status" >&5
-+  echo "$as_me:1502: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -1530,7 +1533,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:1533: checking for a BSD compatible install" >&5
-+echo "$as_me:1536: checking for a BSD compatible install" >&5
- echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-@@ -1579,7 +1582,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:1582: result: $INSTALL" >&5
-+echo "$as_me:1585: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -1592,7 +1595,7 @@
- 
- # Extract the first word of "gs", so it can be a program name with args.
- set dummy gs; ac_word=$2
--echo "$as_me:1595: checking for $ac_word" >&5
-+echo "$as_me:1598: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_GS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1609,7 +1612,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_GS="$ac_dir/$ac_word"
--   echo "$as_me:1612: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:1615: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -1621,163 +1624,19 @@
- GS=$ac_cv_path_GS
- 
- if test -n "$GS"; then
--  echo "$as_me:1624: result: $GS" >&5
-+  echo "$as_me:1627: result: $GS" >&5
- echo "${ECHO_T}$GS" >&6
- else
--  echo "$as_me:1627: result: no" >&5
-+  echo "$as_me:1630: result: no" >&5
+@@ -1628,150 +1631,6 @@ else
  echo "${ECHO_T}no" >&6
  fi
  
@@ -802,118 +198,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:1780: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:1639: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -1794,18 +1653,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1797 "configure"
-+#line 1656 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1802: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1661: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1808: \$? = $ac_status" >&5
-+  echo "$as_me:1667: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -1828,17 +1687,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1831 "configure"
-+#line 1690 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:1835: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1694: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1841: \$? = $ac_status" >&5
-+  echo "$as_me:1700: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -1875,7 +1734,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:1878: result: $CXXCPP" >&5
-+echo "$as_me:1737: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -1885,18 +1744,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1888 "configure"
-+#line 1747 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1893: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1752: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1899: \$? = $ac_status" >&5
-+  echo "$as_me:1758: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -1919,17 +1778,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1922 "configure"
-+#line 1781 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:1926: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1785: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1932: \$? = $ac_status" >&5
-+  echo "$as_me:1791: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -1957,7 +1816,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:1960: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:1819: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1968,23 +1827,114 @@
+@@ -1968,17 +1827,108 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -1028,14 +313,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
    egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1987: \$? = $ac_status" >&5
-+  echo "$as_me:1937: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -1995,186 +1945,1319 @@
+@@ -1995,173 +1945,1306 @@ else
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
@@ -2461,144 +1739,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  echo "${ECHO_T}yes" >&6
  else
    echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:2169: result: no" >&5
-+echo "$as_me:3252: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:2174: checking See if we have libpng and zlib" >&5
-+echo "$as_me:3257: checking See if we have libpng and zlib" >&5
- echo $ECHO_N "checking See if we have libpng and zlib... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 2177 "configure"
-+#line 3260 "configure"
- #include "confdefs.h"
- #include <png.h>
- 	 	 int i = PNG_TRANSFORM_IDENTITY;
-@@ -2187,69 +3270,69 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2190: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3273: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2193: \$? = $ac_status" >&5
-+  echo "$as_me:3276: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3279: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2199: \$? = $ac_status" >&5
-+  echo "$as_me:3282: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   PNGCOMPILEFLAGS="-DHAVE_LIBPNG"; PNGLINKFLAGS="-lpng -lz ";
--               echo "$as_me:2202: result: you seem to have compatible version of libpng" >&5
-+               echo "$as_me:3285: result: you seem to have compatible version of libpng" >&5
- echo "${ECHO_T}you seem to have compatible version of libpng" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--echo "$as_me:2208: result: you either have no libpng or an old version - 1.0.8 should be ok." >&5
-+echo "$as_me:3291: result: you either have no libpng or an old version - 1.0.8 should be ok." >&5
- echo "${ECHO_T}you either have no libpng or an old version - 1.0.8 should be ok." >&6
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:2213: checking C++ compiler model" >&5
-+echo "$as_me:3296: checking C++ compiler model" >&5
- echo $ECHO_N "checking C++ compiler model... $ECHO_C" >&6
- LINK="$CXX $LDFLAGS"
- if test "$GXX" = yes; then
-   if test "$host_os" = riscos; then
--    echo "$as_me:2218: result: GNU on RiscOS" >&5
-+    echo "$as_me:3301: result: GNU on RiscOS" >&5
- echo "${ECHO_T}GNU on RiscOS" >&6
-     SPECIAL_CXXFLAGS="-Wall -Dunix -Ilibgpp: -Ilibstdc: -Ilibio:"
-     LDLIBS="-rescan libgpp:o.libg++ libstdc:o.libstdc++ libio:o.libiostrea gcc:o.libgcc Unix:o.UnixLib"
-     LINK=link
-   else
--    echo "$as_me:2224: result: GNU" >&5
-+    echo "$as_me:3307: result: GNU" >&5
- echo "${ECHO_T}GNU" >&6
-     SPECIAL_CXXFLAGS="-DBUGGYGPP -ansi -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wstrict-prototypes"
-   fi
- elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
--  echo "$as_me:2229: result: AIX xlC" >&5
-+  echo "$as_me:3312: result: AIX xlC" >&5
- echo "${ECHO_T}AIX xlC" >&6
-   CXXFLAGS="-D__unix__ -g -+ -I/usr/lpp/xlC/src/nihC/aixinclude"
- elif test `echo "$CXX" | egrep -c 'cxx$'` -eq 1; then
--  echo "$as_me:2233: result: OSF/1 cxx" >&5
-+  echo "$as_me:3316: result: OSF/1 cxx" >&5
- echo "${ECHO_T}OSF/1 cxx" >&6
-   SPECIAL_CXXFLAGS=-w
-   CXXFLAGS=-define_templates
- elif test `echo "$CXX" | egrep -c 'CC$'` -eq 1; then
-   if test "$host_os" = irix5.3; then
--    echo "$as_me:2239: result: Irix 5.3" >&5
-+    echo "$as_me:3322: result: Irix 5.3" >&5
- echo "${ECHO_T}Irix 5.3" >&6
-     SPECIAL_CXXFLAGS="-O2 -mips2 -Olimit 2400"
-   elif test "$host_os" = irix6.2; then
--    echo "$as_me:2243: result: Irix 6.2" >&5
-+    echo "$as_me:3326: result: Irix 6.2" >&5
- echo "${ECHO_T}Irix 6.2" >&6
-     SPECIAL_CXXFLAGS="-mips3 -n32 -O2 -OPT:fold_arith_limit=2500"
-   elif test "$host_vendor" = sun; then
--    echo "$as_me:2247: result: Sun" >&5
-+    echo "$as_me:3330: result: Sun" >&5
- echo "${ECHO_T}Sun" >&6
-     SPECIAL_CXXFLAGS="-w"
-   fi
- else
--  echo "$as_me:2252: result: unknown" >&5
-+  echo "$as_me:3335: result: unknown" >&5
- echo "${ECHO_T}unknown" >&6
- fi
- # Check whether --enable-wrapper or --disable-wrapper was given.
-@@ -2368,7 +3451,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:2371: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:3454: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -2536,7 +3619,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:2539: error: ambiguous option: $1
-+    { { echo "$as_me:3622: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -2555,7 +3638,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:2558: error: unrecognized option: $1
-+  -*) { { echo "$as_me:3641: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -2591,7 +3674,7 @@
-   case "$ac_config_target" in
-   # Handling of arguments.
-   "../src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../src/Makefile" ;;
--  *) { { echo "$as_me:2594: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:3677: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -2691,10 +3774,14 @@
+@@ -2691,10 +3774,14 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t 
  s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
  s,@INSTALL_DATA@,$INSTALL_DATA,;t t
  s,@GS@,$GS,;t t
@@ -2614,30 +1755,3 @@ $NetBSD: patch-ab,v 1.2 2002/05/07 13:18:27 itohy Exp $
  s,@PLOTCOMPILEFLAGS@,$PLOTCOMPILEFLAGS,;t t
  s,@MINGCOMPILEFLAGS@,$MINGCOMPILEFLAGS,;t t
  s,@EMFCOMPILEFLAGS@,$EMFCOMPILEFLAGS,;t t
-@@ -2817,7 +3904,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:2820: creating $ac_file" >&5
-+    { echo "$as_me:3907: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -2835,7 +3922,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:2838: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:3925: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -2848,7 +3935,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:2851: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:3938: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;