From a0cb37295f9d849af86fd8062c922c9e76b616a0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Thu, 10 Feb 2011 23:53:11 -0800
Subject: [PATCH] Fixed pngstruct.h detection

---
 libguac/configure.in   | 2 +-
 libguac/src/protocol.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libguac/configure.in b/libguac/configure.in
index 76a93868..c401cf1c 100644
--- a/libguac/configure.in
+++ b/libguac/configure.in
@@ -15,7 +15,7 @@ AC_CHECK_LIB([png], [png_write_png],, AC_MSG_ERROR("libpng is required for writi
 AC_CHECK_LIB([wsock32], [main])
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h pngstruct.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
diff --git a/libguac/src/protocol.c b/libguac/src/protocol.c
index f050a868..a2427f21 100644
--- a/libguac/src/protocol.c
+++ b/libguac/src/protocol.c
@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <png.h>
 
-/* If png_structp not defined in png.h, try to include pngstruct.h */
-#ifndef png_structp 
+#ifdef HAVE_PNGSTRUCT_H
 #include <pngstruct.h>
 #endif