mirror of https://github.com/fltk/fltk
Remove obsolete config variable 'HAVE_LIBPNG_PNG_H'
This variable has never been used in the code. Configure and CMake look for a *working* libpng (HAVE_PNG) and set variable HAVE_PNG_H if the header <png.h> can be included. The alternative to include <libpng/png.h> is always used in the #else clause and doesn't need its own config variable. Configure and CMake log what they find, hence this extra variable is not necessary.
This commit is contained in:
parent
2ee27e39db
commit
cc6a7d008b
|
@ -444,19 +444,16 @@ if (OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND)
|
|||
set (_INCLUDE_SAVED ${CMAKE_REQUIRED_INCLUDES})
|
||||
list (APPEND CMAKE_REQUIRED_INCLUDES ${PNG_INCLUDE_DIRS})
|
||||
|
||||
# FIXME - Force search! Maybe use cache to check for option changes?
|
||||
# Note: we do not check for <libpng/png.h> explicitly.
|
||||
# This is assumed to exist if we have PNG_FOUND and don't find <png.h>
|
||||
|
||||
unset (HAVE_PNG_H CACHE)
|
||||
unset (HAVE_LIBPNG_PNG_H CACHE)
|
||||
# FIXME - Force search by unsetting the chache variable. Maybe use
|
||||
# FIXME - another cache variable to check for option changes?
|
||||
|
||||
check_include_files (png.h HAVE_PNG_H)
|
||||
unset (HAVE_PNG_H CACHE) # force search
|
||||
check_include_file (png.h HAVE_PNG_H)
|
||||
mark_as_advanced (HAVE_PNG_H)
|
||||
|
||||
if (NOT HAVE_PNG_H)
|
||||
check_include_files (libpng/png.h HAVE_LIBPNG_PNG_H)
|
||||
mark_as_advanced (HAVE_LIBPNG_PNG_H)
|
||||
endif ()
|
||||
|
||||
set (CMAKE_REQUIRED_INCLUDES ${_INCLUDE_SAVED})
|
||||
unset (_INCLUDE_SAVED)
|
||||
|
||||
|
@ -472,7 +469,6 @@ else ()
|
|||
set (HAVE_PNG_H 1)
|
||||
set (HAVE_PNG_GET_VALID 1)
|
||||
set (HAVE_PNG_SET_TRNS_TO_ALPHA 1)
|
||||
set (HAVE_LIBPNG_PNG_H 0)
|
||||
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/png)
|
||||
endif ()
|
||||
|
||||
|
|
|
@ -260,10 +260,12 @@
|
|||
|
||||
/*
|
||||
* Which header file do we include for libpng?
|
||||
* ifdef HAVE_PNG_H : <png.h>
|
||||
* else : <libpng/png.h>
|
||||
* There is no other choice.
|
||||
*/
|
||||
|
||||
#cmakedefine HAVE_PNG_H 1
|
||||
#cmakedefine HAVE_LIBPNG_PNG_H 1
|
||||
|
||||
/*
|
||||
* Do we have the png_xyz() functions?
|
||||
|
|
|
@ -259,10 +259,12 @@
|
|||
|
||||
/*
|
||||
* Which header file do we include for libpng?
|
||||
* ifdef HAVE_PNG_H : <png.h>
|
||||
* else : <libpng/png.h>
|
||||
* There is no other choice.
|
||||
*/
|
||||
|
||||
#undef HAVE_PNG_H
|
||||
#undef HAVE_LIBPNG_PNG_H
|
||||
|
||||
/*
|
||||
* Do we have the png_xyz() functions?
|
||||
|
|
|
@ -738,7 +738,6 @@ AS_IF([test x$enable_localpng != xyes], [
|
|||
syspnginc_ok=yes
|
||||
])
|
||||
AC_CHECK_HEADER([libpng/png.h], [
|
||||
AC_DEFINE([HAVE_LIBPNG_PNG_H])
|
||||
syspnginc_ok=yes
|
||||
])
|
||||
AS_IF([test x$syspnginc_ok = xyes], [
|
||||
|
@ -815,7 +814,6 @@ AC_SUBST([JPEGINC])
|
|||
AC_SUBST([PNG])
|
||||
AC_SUBST([PNGINC])
|
||||
AC_SUBST([HAVE_PNG_H])
|
||||
AC_SUBST([HAVE_LIBPNG_H])
|
||||
AC_SUBST([ZLIB])
|
||||
AC_SUBST([ZLIBINC])
|
||||
|
||||
|
|
Loading…
Reference in New Issue