Browse Source

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
pull/168/head
Michael R Sweet 24 years ago
parent
commit
8310941985
  1. 9
      CHANGES
  2. 7
      configh.in
  3. 6
      configure.in
  4. 27
      makefiles/config.cygwin
  5. 27
      makefiles/config.mingw
  6. 27
      makefiles/config.no-cygwin
  7. 27
      makefiles/config.os2x
  8. 8
      visualc/config.h

9
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 CHANGES IN FLTK 1.1.0b3
- The top-level makefile did not include the makeinclude - The top-level makefile did not include the makeinclude

7
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). * Configuration file for the Fast Light Tool Kit (FLTK).
* @configure_input@ * @configure_input@
@ -192,12 +192,13 @@
#undef HAVE_LIBJPEG #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_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 $".
*/ */

6
configure.in

@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl 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
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@ -203,7 +203,7 @@ AC_CHECK_HEADER(png.h,
AC_DEFINE(HAVE_LIBPNG) AC_DEFINE(HAVE_LIBPNG)
IMAGELIBS="-lpng -lm$IMAGELIBS" IMAGELIBS="-lpng -lm$IMAGELIBS"
LIBS="-lpng -lm $LIBS" 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... dnl Restore original LIBS settings...
LIBS="$SAVELIBS" LIBS="$SAVELIBS"
@ -461,5 +461,5 @@ AC_OUTPUT(makeinclude fltk-config)
chmod +x fltk-config chmod +x fltk-config
dnl 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 dnl

27
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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@ -23,6 +23,13 @@
* Please report all bugs and problems to "FLTK-bugs@fltk.org". * Please report all bugs and problems to "FLTK-bugs@fltk.org".
*/ */
/*
* Where to find the documentation files...
*/
#define FLTK_DOCDIR "C:/FLTK/DOC"
/* /*
* BORDER_WIDTH: * BORDER_WIDTH:
* *
@ -159,5 +166,21 @@
#define HAVE_POLL 0 #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 $".
*/ */

27
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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@ -23,6 +23,13 @@
* Please report all bugs and problems to "FLTK-bugs@fltk.org". * Please report all bugs and problems to "FLTK-bugs@fltk.org".
*/ */
/*
* Where to find the documentation files...
*/
#define FLTK_DOCDIR "C:/FLTK/DOC"
/* /*
* BORDER_WIDTH: * BORDER_WIDTH:
* *
@ -159,5 +166,21 @@
#define HAVE_POLL 0 #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 $".
*/ */

27
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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@ -23,6 +23,13 @@
* Please report all bugs and problems to "FLTK-bugs@fltk.org". * Please report all bugs and problems to "FLTK-bugs@fltk.org".
*/ */
/*
* Where to find the documentation files...
*/
#define FLTK_DOCDIR "C:/FLTK/DOC"
/* /*
* BORDER_WIDTH: * BORDER_WIDTH:
* *
@ -159,5 +166,21 @@
#define HAVE_POLL 0 #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 $".
*/ */

27
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). * Configuration file for the Fast Light Tool Kit (FLTK).
* *
@ -23,6 +23,13 @@
* Please report all bugs and problems to "FLTK-bugs@fltk.org". * Please report all bugs and problems to "FLTK-bugs@fltk.org".
*/ */
/*
* Where to find the documentation files...
*/
#define FLTK_DOCDIR "C:/FLTK/DOC"
/* /*
* BORDER_WIDTH: * BORDER_WIDTH:
* *
@ -156,5 +163,21 @@
#define HAVE_POLL 0 #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 $".
*/ */

8
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++. * Configuration file for the Fast Light Tool Kit (FLTK) for Visual C++.
* *
@ -168,11 +168,13 @@
#undef HAVE_LIBJPEG #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_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 $".
*/ */

Loading…
Cancel
Save