From 7b99f66d03c60cfd8b46e3350420ef07d1fdcc9c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 24 Apr 2002 18:29:06 +0000 Subject: Add check for libpng/png.h as well as png.h, and include the appropriate one as needed... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2106 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- makefiles/config.mingw | 12 +++++++++--- makefiles/config.os2x | 13 +++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) (limited to 'makefiles') diff --git a/makefiles/config.mingw b/makefiles/config.mingw index ef1c3c421..100951d19 100644 --- a/makefiles/config.mingw +++ b/makefiles/config.mingw @@ -1,5 +1,5 @@ /* - * "$Id: config.mingw,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $" + * "$Id: config.mingw,v 1.1.2.3.2.3 2002/04/24 18:29:05 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -29,7 +29,6 @@ #define FLTK_DOCDIR "C:/FLTK/DOC" - /* * BORDER_WIDTH: * @@ -173,6 +172,13 @@ #undef HAVE_LIBZ #undef HAVE_LIBJPEG +/* + * Which header file do we include for libpng? + */ + +#undef HAVE_PNG_H +#undef HAVE_LIBPNG_PNG_H + /* * Do we have the png_xyz() functions? */ @@ -183,5 +189,5 @@ /* - * End of "$Id: config.mingw,v 1.1.2.3.2.2 2001/10/19 14:04:08 easysw Exp $". + * End of "$Id: config.mingw,v 1.1.2.3.2.3 2002/04/24 18:29:05 easysw Exp $". */ diff --git a/makefiles/config.os2x b/makefiles/config.os2x index 70178494e..aa3574d62 100644 --- a/makefiles/config.os2x +++ b/makefiles/config.os2x @@ -1,6 +1,6 @@ /* config.h. Generated automatically by configure. */ /* - * "$Id: config.os2x,v 1.1.2.4.2.4 2002/03/26 18:47:01 easysw Exp $" + * "$Id: config.os2x,v 1.1.2.4.2.5 2002/04/24 18:29:05 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @configure_input@ @@ -31,7 +31,6 @@ #define FLTK_DOCDIR "/usr/local/share/doc/fltk" - /* * BORDER_WIDTH: * @@ -197,6 +196,13 @@ #define HAVE_LIBZ 1 #define HAVE_LIBJPEG 1 +/* + * Which header file do we include for libpng? + */ + +#define HAVE_PNG_H +#undef HAVE_LIBPNG_PNG_H + /* * Do we have the png_xyz() functions? */ @@ -205,7 +211,6 @@ /* #undef HAVE_PNG_SET_TRNS_TO_ALPHA */ #define HAVE_PNG_READ_DESTROY 1 - /* * Do we have POSIX threading? */ @@ -215,5 +220,5 @@ /* - * End of "$Id: config.os2x,v 1.1.2.4.2.4 2002/03/26 18:47:01 easysw Exp $". + * End of "$Id: config.os2x,v 1.1.2.4.2.5 2002/04/24 18:29:05 easysw Exp $". */ -- cgit v1.2.3