dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "configure: drop experimental from mux/demux" into 0.3.0

Browse Source
This commit is contained in:
James Zern 2013-03-16 12:05:30 -07:00 committed by Gerrit Code Review
commit 42b611a491
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

@ -176,7 +176,7 @@ CPPFLAGS=$SAVED_CPPFLAGS
LIBS=$SAVED_LIBS LIBS=$SAVED_LIBS
if test "$gif_support" = "yes" -a \ if test "$gif_support" = "yes" -a \
"$enable_experimental_libwebpmux" = "yes"; then "$enable_libwebpmux" = "yes"; then
build_gif2webp=yes build_gif2webp=yes
fi fi
AM_CONDITIONAL([BUILD_GIF2WEBP], [test "${build_gif2webp}" = "yes"]) AM_CONDITIONAL([BUILD_GIF2WEBP], [test "${build_gif2webp}" = "yes"])
@ -252,19 +252,19 @@ AC_SUBST(USE_EXPERIMENTAL_CODE)
dnl === Check whether libwebpmux should be built dnl === Check whether libwebpmux should be built
AC_MSG_CHECKING(whether libwebpmux is to be built) AC_MSG_CHECKING(whether libwebpmux is to be built)
AC_ARG_ENABLE([experimental-libwebpmux], AC_ARG_ENABLE([libwebpmux],
AS_HELP_STRING([--enable-experimental-libwebpmux], AS_HELP_STRING([--enable-libwebpmux],
[Build libwebpmux @<:@default=no@:>@])) [Build libwebpmux @<:@default=no@:>@]))
AC_MSG_RESULT(${enable_experimental_libwebpmux-no}) AC_MSG_RESULT(${enable_libwebpmux-no})
AM_CONDITIONAL([WANT_MUX], [test "$enable_experimental_libwebpmux" = "yes"]) AM_CONDITIONAL([WANT_MUX], [test "$enable_libwebpmux" = "yes"])
dnl === Check whether libwebpdemux should be built dnl === Check whether libwebpdemux should be built
AC_MSG_CHECKING(whether libwebpdemux is to be built) AC_MSG_CHECKING(whether libwebpdemux is to be built)
AC_ARG_ENABLE([experimental-libwebpdemux], AC_ARG_ENABLE([libwebpdemux],
AS_HELP_STRING([--enable-experimental-libwebpdemux], AS_HELP_STRING([--enable-libwebpdemux],
[Build libwebpdemux @<:@default=no@:>@])) [Build libwebpdemux @<:@default=no@:>@]))
AC_MSG_RESULT(${enable_experimental_libwebpdemux-no}) AC_MSG_RESULT(${enable_libwebpdemux-no})
AM_CONDITIONAL([WANT_DEMUX], [test "$enable_experimental_libwebpdemux" = "yes"]) AM_CONDITIONAL([WANT_DEMUX], [test "$enable_libwebpdemux" = "yes"])
dnl === Check whether decoder library should be built. dnl === Check whether decoder library should be built.
AC_MSG_CHECKING(whether decoder library is to be built) AC_MSG_CHECKING(whether decoder library is to be built)
@ -298,8 +298,8 @@ Static libraries: ${enable_static}
Threaded decode: ${enable_threading-no} Threaded decode: ${enable_threading-no}
libwebp: yes libwebp: yes
libwebpdecoder: ${enable_libwebpdecoder-no} libwebpdecoder: ${enable_libwebpdecoder-no}
libwebpdemux: ${enable_experimental_libwebpdemux-no} libwebpdemux: ${enable_libwebpdemux-no}
libwebpmux: ${enable_experimental_libwebpmux-no} libwebpmux: ${enable_libwebpmux-no}
Tools: Tools:
cwebp: yes cwebp: yes
@ -315,5 +315,5 @@ dwebp: yes
PNG : ${png_support-no} PNG : ${png_support-no}
WIC : ${wic_support-no} WIC : ${wic_support-no}
gif2webp: ${build_gif2webp-no} gif2webp: ${build_gif2webp-no}
webpmux: ${enable_experimental_libwebpmux-no} webpmux: ${enable_libwebpmux-no}
]) ])