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

Merge "configure: broaden test for libpng-config"

Browse Source
This commit is contained in:
James Zern 2012-07-13 11:13:26 -07:00 committed by Gerrit Code Review
commit 23b44438dd
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -55,13 +55,15 @@ dnl === check for PNG support ===
PNG_INCLUDES="" PNG_INCLUDES=""
PNG_LIBS="" PNG_LIBS=""
AC_PATH_PROG(LIBPNG_CONFIG, libpng-config) AC_PATH_PROGS(LIBPNG_CONFIG,
[libpng-config libpng15-config libpng14-config libpng12-config])
if test -n "$LIBPNG_CONFIG"; then if test -n "$LIBPNG_CONFIG"; then
PNG_INCLUDES=`$LIBPNG_CONFIG --cflags` PNG_INCLUDES=`$LIBPNG_CONFIG --cflags`
PNG_PREFIX=`$LIBPNG_CONFIG --prefix` PNG_PREFIX=`$LIBPNG_CONFIG --prefix`
if test "${PNG_PREFIX}/lib" != "/usr/lib" ; then if test "${PNG_PREFIX}/lib" != "/usr/lib" ; then
PNG_LIBS="-L${PNG_PREFIX}/lib" PNG_LIBS="-L${PNG_PREFIX}/lib"
fi fi
PNG_LIBS="$PNG_LIBS `$LIBPNG_CONFIG --libs`"
fi fi
WITHLIB_OPTION([png], [PNG]) WITHLIB_OPTION([png], [PNG])
@ -72,15 +74,22 @@ CPPFLAGS="$PNG_INCLUDES $CPPFLAGS"
LIBS="$PNG_LIBS $LIBS" LIBS="$PNG_LIBS $LIBS"
AC_CHECK_HEADER(png.h, AC_CHECK_HEADER(png.h,
AC_CHECK_LIB(png, png_get_libpng_ver, AC_SEARCH_LIBS(png_get_libpng_ver, [png],
[PNG_LIBS="$PNG_LIBS -lpng" [test "$ac_cv_search_png_get_libpng_ver" = "none required" \
|| PNG_LIBS="$PNG_LIBS $ac_cv_search_png_get_libpng_ver"
PNG_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG" PNG_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG"
AC_DEFINE(WEBP_HAVE_PNG, [1], AC_DEFINE(WEBP_HAVE_PNG, [1],
[Set to 1 if PNG library is installed]) [Set to 1 if PNG library is installed])
], ],
AC_MSG_WARN(Optional png library not found), [AC_MSG_WARN(Optional png library not found)
PNG_LIBS=""
PNG_INCLUDES=""
],
[$MATH_LIBS]), [$MATH_LIBS]),
AC_MSG_WARN(png library not available - no png.h) [AC_MSG_WARN(png library not available - no png.h)
PNG_LIBS=""
PNG_INCLUDES=""
],
) )
AC_SUBST(PNG_LIBS) AC_SUBST(PNG_LIBS)
AC_SUBST(PNG_INCLUDES) AC_SUBST(PNG_INCLUDES)