Check for png_set_tRNS_to_alpha() in configure script.

Add image and documentation defines to all of the config.h files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

8 files changed, 121 insertions, 17 deletions

diff --git a/CHANGES b/CHANGES
index 43eb92392..a760b3454 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+CHANGES IN FLTK 1.1.0b4
+
+	- Updated the configure script to check for the
+	  png_set_tRNS_to_alpha() function.
+
+	- Updated the config.h files for all platforms for the
+	  image and FLTK documentation defines.
+
+
 CHANGES IN FLTK 1.1.0b3
 
 	- The top-level makefile did not include the makeinclude
diff --git a/configh.in b/configh.in
index 3a4db9370..aa6ef40c0 100644
--- a/configh.in
+++ b/configh.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: configh.in,v 1.11.2.11.2.2 2001/08/11 16:09:25 easysw Exp $"
+ * "$Id: configh.in,v 1.11.2.11.2.3 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  * @configure_input@
@@ -192,12 +192,13 @@
 #undef HAVE_LIBJPEG
 
 /*
- * Do we have the png_get_valid() function?
+ * Do we have the png_xyz() functions?
  */
 
 #undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
 
 
 /*
- * End of "$Id: configh.in,v 1.11.2.11.2.2 2001/08/11 16:09:25 easysw Exp $".
+ * End of "$Id: configh.in,v 1.11.2.11.2.3 2001/10/01 16:49:29 easysw Exp $".
  */
diff --git a/configure.in b/configure.in
index 2f1a90215..a0522de15 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.8 2001/09/29 15:57:32 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.9 2001/10/01 16:49:29 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -203,7 +203,7 @@ AC_CHECK_HEADER(png.h,
 	AC_DEFINE(HAVE_LIBPNG)
 	IMAGELIBS="-lpng -lm$IMAGELIBS"
 	LIBS="-lpng -lm $LIBS"
-	AC_CHECK_FUNCS(png_get_valid)))
+	AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)))
 
 dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"
@@ -461,5 +461,5 @@ AC_OUTPUT(makeinclude fltk-config)
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.8 2001/09/29 15:57:32 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.9 2001/10/01 16:49:29 easysw Exp $".
 dnl
diff --git a/makefiles/config.cygwin b/makefiles/config.cygwin
index 35c26f457..77a7a56ed 100644
--- a/makefiles/config.cygwin
+++ b/makefiles/config.cygwin
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.cygwin,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $"
+ * "$Id: config.cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
@@ -24,6 +24,13 @@
  */
 
 /*
+ * Where to find the documentation files...
+ */
+
+#define FLTK_DOCDIR	"C:/FLTK/DOC"
+
+
+/*
  * BORDER_WIDTH:
  *
  * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
@@ -159,5 +166,21 @@
 #define HAVE_POLL 0
 
 /*
- * End of "$Id: config.cygwin,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $".
+ * Do we have various image libraries?
+ */
+
+#undef HAVE_LIBPNG
+#undef HAVE_LIBZ
+#undef HAVE_LIBJPEG
+
+/*
+ * Do we have the png_xyz() functions?
+ */
+
+#undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
+
+
+/*
+ * End of "$Id: config.cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $".
  */
diff --git a/makefiles/config.mingw b/makefiles/config.mingw
index bfe81e950..b5b35f8cb 100644
--- a/makefiles/config.mingw
+++ b/makefiles/config.mingw
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $"
+ * "$Id: config.mingw,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
@@ -24,6 +24,13 @@
  */
 
 /*
+ * Where to find the documentation files...
+ */
+
+#define FLTK_DOCDIR	"C:/FLTK/DOC"
+
+
+/*
  * BORDER_WIDTH:
  *
  * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
@@ -159,5 +166,21 @@
 #define HAVE_POLL 0
 
 /*
- * End of "$Id: config.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $".
+ * Do we have various image libraries?
+ */
+
+#undef HAVE_LIBPNG
+#undef HAVE_LIBZ
+#undef HAVE_LIBJPEG
+
+/*
+ * Do we have the png_xyz() functions?
+ */
+
+#undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
+
+
+/*
+ * End of "$Id: config.mingw,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $".
  */
diff --git a/makefiles/config.no-cygwin b/makefiles/config.no-cygwin
index 27dfecdc3..2330a6042 100644
--- a/makefiles/config.no-cygwin
+++ b/makefiles/config.no-cygwin
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.no-cygwin,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $"
+ * "$Id: config.no-cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
@@ -24,6 +24,13 @@
  */
 
 /*
+ * Where to find the documentation files...
+ */
+
+#define FLTK_DOCDIR	"C:/FLTK/DOC"
+
+
+/*
  * BORDER_WIDTH:
  *
  * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
@@ -159,5 +166,21 @@
 #define HAVE_POLL 0
 
 /*
- * End of "$Id: config.no-cygwin,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $".
+ * Do we have various image libraries?
+ */
+
+#undef HAVE_LIBPNG
+#undef HAVE_LIBZ
+#undef HAVE_LIBJPEG
+
+/*
+ * Do we have the png_xyz() functions?
+ */
+
+#undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
+
+
+/*
+ * End of "$Id: config.no-cygwin,v 1.1.2.3.2.1 2001/10/01 16:49:29 easysw Exp $".
  */
diff --git a/makefiles/config.os2x b/makefiles/config.os2x
index 3ac6c730c..f7dc25cde 100644
--- a/makefiles/config.os2x
+++ b/makefiles/config.os2x
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.os2x,v 1.1.2.4 2001/05/06 13:32:48 easysw Exp $"
+ * "$Id: config.os2x,v 1.1.2.4.2.1 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
@@ -24,6 +24,13 @@
  */
 
 /*
+ * Where to find the documentation files...
+ */
+
+#define FLTK_DOCDIR	"C:/FLTK/DOC"
+
+
+/*
  * BORDER_WIDTH:
  *
  * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
@@ -156,5 +163,21 @@
 #define HAVE_POLL 0
 
 /*
- * End of "$Id: config.os2x,v 1.1.2.4 2001/05/06 13:32:48 easysw Exp $".
+ * Do we have various image libraries?
+ */
+
+#undef HAVE_LIBPNG
+#undef HAVE_LIBZ
+#undef HAVE_LIBJPEG
+
+/*
+ * Do we have the png_xyz() functions?
+ */
+
+#undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
+
+
+/*
+ * End of "$Id: config.os2x,v 1.1.2.4.2.1 2001/10/01 16:49:29 easysw Exp $".
  */
diff --git a/visualc/config.h b/visualc/config.h
index 5794618ff..54fa114d4 100644
--- a/visualc/config.h
+++ b/visualc/config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h,v 1.5.2.5.2.3 2001/09/23 13:08:03 easysw Exp $"
+ * "$Id: config.h,v 1.5.2.5.2.4 2001/10/01 16:49:29 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++.
  *
@@ -168,11 +168,13 @@
 #undef HAVE_LIBJPEG
 
 /*
- * Do we have the png_get_valid() function?
+ * Do we have the png_xyz() functions?
  */
 
 #undef HAVE_PNG_GET_VALID
+#undef HAVE_PNG_SET_TRNS_TO_ALPHA
+
 
 /*
- * End of "$Id: config.h,v 1.5.2.5.2.3 2001/09/23 13:08:03 easysw Exp $".
+ * End of "$Id: config.h,v 1.5.2.5.2.4 2001/10/01 16:49:29 easysw Exp $".
  */