gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-19 21:34:12 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: Moved configure's detection of JPEG 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

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

57
m4/wm_imgfmt_check.m4
View File

@@ -79,6 +79,63 @@ const char *filename = "dummy";],
]) dnl AC_DEFUN
# WM_IMGFMT_CHECK_JPEG
# --------------------
#
# Check for JPEG file support through 'libjpeg'
# The check depends on variable 'enable_jpeg' being either:
# yes - detect, fail if not found
# no - do not detect, disable support
# auto - detect, disable if not found
#
# When found, append appropriate stuff in GFXLIBS, and append info to
# the variable 'supported_gfx'
# When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_JPEG],
[AC_REQUIRE([_WM_IMGFMT_CHECK_FUNCTS])
AS_IF([test "x$enable_jpeg" = "xno"],
[unsupported="$unsupported JPEG"],
[AC_CACHE_CHECK([for JPEG support library], [wm_cv_imgfmt_jpeg],
[wm_cv_imgfmt_jpeg=no
wm_save_LIBS="$LIBS"
dnl
dnl We check first if one of the known libraries is available
AS_IF([wm_fn_imgfmt_try_link "jpeg_destroy_compress" "$XLFLAGS $XLIBS -ljpeg"],
[wm_cv_imgfmt_jpeg="-ljpeg"])
LIBS="$wm_save_LIBS"
AS_IF([test "x$enable_jpeg$wm_cv_imgfmt_jpeg" = "xyesno"],
[AC_MSG_ERROR([explicit JPEG support requested but no library found])])
AS_IF([test "x$wm_cv_imgfmt_jpeg" != "xno"],
[dnl
dnl A library was found, now check for the appropriate header
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[@%:@include <stdlib.h>
@%:@include <stdio.h>
@%:@include <jpeglib.h>],
[ struct jpeg_decompress_struct cinfo;
jpeg_destroy_decompress(&cinfo);])],
[],
[AS_ECHO([failed])
AS_ECHO(["$as_me: error: found $wm_cv_imgfmt_jpeg but cannot compile header"])
AS_ECHO(["$as_me: error: - does header 'jpeglib.h' exists? (is package 'jpeg-dev' missing?)"])
AS_ECHO(["$as_me: error: - version of header is not supported? (report to dev team)"])
AC_MSG_ERROR([JPEG library is not usable, cannot continue])])
])
])
AS_IF([test "x$wm_cv_imgfmt_jpeg" = "xno"],
[unsupported="$unsupported JPEG"
enable_jpeg="no"],
[supported_gfx="$supported_gfx JPEG"
GFXLIBS="$GFXLIBS $wm_cv_imgfmt_jpeg"
AC_DEFINE([USE_JPEG], [1],
[defined when valid JPEG library with header was found])])
])
AM_CONDITIONAL([USE_JPEG], [test "x$enable_jpeg" != "xno"])dnl
]) dnl AC_DEFUN
# _WM_IMGFMT_CHECK_FUNCTS
# -----------------------
# (internal shell functions)