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

configure: broaden test for libpng-config

Browse Source 
some versions of cygwin's libpng-devel only install libpngXX-config,
e.g., libpng12-config, but do not create libpng-config. the library also
has a version number.

Change-Id: I35332b7011e2dbabb95b599f810523a729d6097e
This commit is contained in:
James Zern 2012-07-10 18:00:15 -07:00
parent 63db87dd2a
commit 0fc2baae5c
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -38,13 +38,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])
@ -55,15 +57,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_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG" || PNG_LIBS="$PNG_LIBS $ac_cv_search_png_get_libpng_ver"
AC_DEFINE(WEBP_HAVE_PNG, [1], PNG_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG"
[Set to 1 if PNG library is installed]) AC_DEFINE(WEBP_HAVE_PNG, [1],
], [Set to 1 if PNG library is installed])
AC_MSG_WARN(Optional png library not found), ],
[$MATH_LIBS]), [AC_MSG_WARN(Optional png library not found)
AC_MSG_WARN(png library not available - no png.h) PNG_LIBS=""
PNG_INCLUDES=""
],
[$MATH_LIBS]),
[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)