dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-24 21:12:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly use the AC_CANONICAL_* macros

Browse Source 
http://www.gnu.org/software/autoconf/manual/autoconf.html#Using-System-Type

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
(cherry picked from commit 63c2fc02ce3d0674a0a6d1e10e9ee04a76aa9d5d)

Change-Id: I40a13e84f5266ed20bc4db098502b1610ab71206
This commit is contained in:
Timothy Gu 2014-08-05 20:55:04 -07:00 committed by James Zern
parent 40aa8b69b0
commit 245c4a6737
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1,7 +1,7 @@
AC_INIT([libwebp], [0.4.1], AC_INIT([libwebp], [0.4.1],
[http://code.google.com/p/webp/issues],, [http://code.google.com/p/webp/issues],,
[http://developers.google.com/speed/webp]) [http://developers.google.com/speed/webp])
AC_CANONICAL_TARGET AC_CANONICAL_HOST
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
@ -409,8 +409,9 @@ AC_ARG_ENABLE([wic],
@<:@default=auto@:>@]),, @<:@default=auto@:>@]),,
[enable_wic=yes]) [enable_wic=yes])
if test \( "$target_os" = "mingw32" -o "$target_os" = "mingw64" \) \ case $host_os in
-a "$enable_wic" = "yes"; then mingw*)
if test "$enable_wic" = "yes"; then
AC_CHECK_HEADERS([wincodec.h shlwapi.h windows.h]) AC_CHECK_HEADERS([wincodec.h shlwapi.h windows.h])
if test "$ac_cv_header_wincodec_h" = "yes"; then if test "$ac_cv_header_wincodec_h" = "yes"; then
AC_MSG_CHECKING(for Windows Imaging Component support) AC_MSG_CHECKING(for Windows Imaging Component support)
@ -450,6 +451,7 @@ if test \( "$target_os" = "mingw32" -o "$target_os" = "mingw64" \) \
AC_MSG_RESULT(${wic_support-no}) AC_MSG_RESULT(${wic_support-no})
fi fi
fi fi
esac
dnl === If --enable-aligned is defined, define WEBP_FORCE_ALIGNED dnl === If --enable-aligned is defined, define WEBP_FORCE_ALIGNED