--- configure.orig	2004-08-03 09:20:13.000000000 +1000
+++ configure	2009-09-26 01:11:40.000000000 +1000
@@ -10646,6 +10646,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "png.h"
 int main (void)
@@ -10653,7 +10654,7 @@
   const char *version = png_get_libpng_ver(NULL)
     ;
   fprintf (stderr, "%s\n", version);
-  return ! (strcmp (version ? version : "", "$required_libpng_version") >= 0);
+  return (system ("pkg-config --atleast-version=$required_libpng_version libpng"));
 }
 
 
@@ -14933,7 +14934,7 @@
             ;;
           k6-*)           pov_arch="k6"; pov_arch_fallback="i686";;
           k7-*)           pov_arch="k7"; pov_arch_fallback="i686";;
-          k8-*|x86_64-*)  pov_arch="k8"; pov_arch_fallback="i686";;
+          k8-*)           pov_arch="k8"; pov_arch_fallback="i686";;
           *)              pov_arch="unknown";;
         esac
       fi
