mirror of https://github.com/freetype/freetype
[build] use AC_CHECK_PROG() macro for libpng-config detection
* builds/unix/configure.raw: use AC_CHECK_PROG() instead of `which` to find `libpng-config`.
This commit is contained in:
parent
32cfab4be7
commit
bccf1cd6b4
|
@ -406,16 +406,12 @@ if test x"$with_png" = xyes -o x"$with_png" = xauto; then
|
||||||
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
|
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
|
||||||
else
|
else
|
||||||
# fall back to config script
|
# fall back to config script
|
||||||
AC_MSG_CHECKING([for libpng-config])
|
AC_CHECK_PROG(have_libpng, [libpng-config], [yes (libpng-config)], [no])
|
||||||
if which libpng-config > /dev/null 2>&1; then
|
if test "$have_libpng" != no; then
|
||||||
LIBPNG_CFLAGS=`libpng-config --cflags`
|
LIBPNG_CFLAGS=`libpng-config --cflags`
|
||||||
LIBPNG_LIBS=`libpng-config --ldflags`
|
LIBPNG_LIBS=`libpng-config --ldflags`
|
||||||
libpng_libspriv=`libpng-config --static --ldflags`
|
libpng_libspriv=`libpng-config --static --ldflags`
|
||||||
libpng_libsstaticconf="$libpng_libspriv"
|
libpng_libsstaticconf="$libpng_libspriv"
|
||||||
have_libpng="yes (libpng-config)"
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue