gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-27 18:35:52 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: Moved configure's detection of PNG support to a dedicated macro

Browse Source 
The original check was not compliant with autoconf's syntax, did not
have a very good behaviour for user and was not easy to make evolve.

The new macro:
 - uses as much as possible autoconf macros for portability and code
consistency;
 - provides a consistent behaviour on yes/no/auto (if user explicitly
enables support, do not silently disable if not found; if library is found
but not the header, complain to let user install it or explicitly disable
support);
 - makes uses of shell functions to keep generated configure smaller by
sharing reusable stuff;
 - uses an automake conditional to avoid compiling the file is support is
not enabled

It includes a typo fixed by Amadeusz S-B³awiñski.-A

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-04 20:52:30 +01:00
committed by Carlos R. Mafra
parent 777bf28ab3
commit 1c21d946ec
4 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
configure.ac
View File

@@ -657,36 +657,13 @@ dnl ===============================================
dnl PNG Support
dnl ===========
png=yes
AC_ARG_ENABLE(png, AS_HELP_STRING([--disable-png], [disable PNG support through libpng]),
png=$enableval, png=yes, png=no)
if test "$png" = yes ; then
my_libname=""
WM_CHECK_LIB(png, png_get_valid, [-lm])
if test "x$ac_cv_lib_png_png_get_valid" = xyes; then
my_libname="-lpng"
fi
dnl
dnl Retry with zlib
dnl
if test "x$my_libname" = x; then
unset ac_cv_lib_png_png_get_valid
WM_CHECK_LIB(png, png_get_valid, [-lz -lm])
if test "x$ac_cv_lib_png_png_get_valid" = xyes; then
my_libname="-lpng -lz"
fi
fi
if test "x$ac_cv_lib_png_png_get_valid" = xyes; then
WM_CHECK_HEADER(png.h)
if test "x$ac_cv_header_png_h" = xyes; then
GFXLIBS="$GFXLIBS $my_libname"
supported_gfx="$supported_gfx PNG"
AC_DEFINE(USE_PNG, 1, [define if PNG libraries are available (set by configure)])
fi
fi
fi
AC_ARG_ENABLE([png],
[AS_HELP_STRING([--disable-png], [disable PNG support through libpng])],
[AS_CASE(["$enableval"],
[yes|no], [],
[AC_MSG_ERROR([bad value $enableval for --enable-png])] )],
[enable_png=auto])
WM_IMGFMT_CHECK_PNG
dnl JPEG Support