Make it possible to avoid automagic dependencies
See https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies for more info. This patch makes it possible to request several dependencies not to be used even if they are present on the system. Change-Id: Ib32f60c001ade01eda3e89463279725ee4243ca2
This commit is contained in:
parent
c741183c10
commit
73a304e953
31
configure.ac
31
configure.ac
@ -32,7 +32,8 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
|
||||
AC_SUBST([pkgconfigdir])
|
||||
|
||||
dnl === TEST_AND_ADD_CFLAGS(flag)
|
||||
dnl === Checks whether $CC supports 'flag' and adds it to AM_CFLAGS on success.
|
||||
dnl === Checks whether $CC supports 'flag' and adds it to AM_CFLAGS
|
||||
dnl === on success.
|
||||
AC_DEFUN([TEST_AND_ADD_CFLAGS],
|
||||
[SAVED_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-Werror $1"
|
||||
@ -111,6 +112,11 @@ fi
|
||||
AC_MSG_NOTICE([checking if threading is enabled... ${enable_threading-no}])
|
||||
|
||||
dnl === check for OpenGL/GLUT support ===
|
||||
|
||||
AC_ARG_ENABLE([gl], AS_HELP_STRING([--disable-gl],
|
||||
[Disable detection of OpenGL support
|
||||
@<:@default=auto@:>@]))
|
||||
AS_IF([test "x$enable_gl" != "xno"], [
|
||||
CLEAR_LIBVARS([GL])
|
||||
WITHLIB_OPTION([gl], [GL])
|
||||
|
||||
@ -209,10 +215,15 @@ LIBCHECK_EPILOGUE([GL])
|
||||
if test "$glut_support" = "yes" -a "$enable_libwebpdemux" = "yes"; then
|
||||
build_vwebp=yes
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL([BUILD_VWEBP], [test "$build_vwebp" = "yes"])
|
||||
|
||||
dnl === check for PNG support ===
|
||||
|
||||
AC_ARG_ENABLE([png], AS_HELP_STRING([--disable-png],
|
||||
[Disable detection of PNG format support
|
||||
@<:@default=auto@:>@]))
|
||||
AS_IF([test "x$enable_png" != "xno"], [
|
||||
CLEAR_LIBVARS([PNG])
|
||||
AC_PATH_PROGS(LIBPNG_CONFIG,
|
||||
[libpng-config libpng15-config libpng14-config libpng12-config])
|
||||
@ -248,9 +259,15 @@ AC_CHECK_HEADER(png.h,
|
||||
],
|
||||
)
|
||||
LIBCHECK_EPILOGUE([PNG])
|
||||
])
|
||||
|
||||
dnl === check for JPEG support ===
|
||||
|
||||
AC_ARG_ENABLE([jpeg],
|
||||
AS_HELP_STRING([--disable-jpeg],
|
||||
[Disable detection of JPEG format support
|
||||
@<:@default=auto@:>@]))
|
||||
AS_IF([test "x$enable_jpeg" != "xno"], [
|
||||
CLEAR_LIBVARS([JPEG])
|
||||
WITHLIB_OPTION([jpeg], [JPEG])
|
||||
|
||||
@ -268,9 +285,15 @@ AC_CHECK_HEADER(jpeglib.h,
|
||||
AC_MSG_WARN(jpeg library not available - no jpeglib.h)
|
||||
)
|
||||
LIBCHECK_EPILOGUE([JPEG])
|
||||
])
|
||||
|
||||
dnl === check for TIFF support ===
|
||||
|
||||
AC_ARG_ENABLE([tiff],
|
||||
AS_HELP_STRING([--disable-tiff],
|
||||
[Disable detection of TIFF format support
|
||||
@<:@default=auto@:>@]))
|
||||
AS_IF([test "x$enable_tiff" != "xno"], [
|
||||
CLEAR_LIBVARS([TIFF])
|
||||
WITHLIB_OPTION([tiff], [TIFF])
|
||||
|
||||
@ -288,9 +311,14 @@ AC_CHECK_HEADER(tiffio.h,
|
||||
AC_MSG_WARN(tiff library not available - no tiffio.h)
|
||||
)
|
||||
LIBCHECK_EPILOGUE([TIFF])
|
||||
])
|
||||
|
||||
dnl === check for GIF support ===
|
||||
|
||||
AC_ARG_ENABLE([gif], AS_HELP_STRING([--disable-gif],
|
||||
[Disable detection of GIF format support
|
||||
@<:@default=auto@:>@]))
|
||||
AS_IF([test "x$enable_gif" != "xno"], [
|
||||
CLEAR_LIBVARS([GIF])
|
||||
WITHLIB_OPTION([gif], [GIF])
|
||||
|
||||
@ -312,6 +340,7 @@ if test "$gif_support" = "yes" -a \
|
||||
"$enable_libwebpmux" = "yes"; then
|
||||
build_gif2webp=yes
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL([BUILD_GIF2WEBP], [test "${build_gif2webp}" = "yes"])
|
||||
|
||||
dnl === check for WIC support ===
|
||||
|
Loading…
Reference in New Issue
Block a user