Skip to content

use AC_CHECK_PROG() macro for libpng-config detection

suzuki toshiya requested to merge mpsuzuki/freetype-mps-wip:fix-libpng-config into master

Currently, configure.raw has raw shell scripting to detect libpng-config, like below.

      # fall back to config script
      AC_MSG_CHECKING([for libpng-config])
      if which libpng-config > /dev/null 2>&1; then
        LIBPNG_CFLAGS=`libpng-config --cflags`
        LIBPNG_LIBS=`libpng-config --ldflags`
        libpng_libspriv=`libpng-config --static --ldflags`
        libpng_libsstaticconf="$libpng_libspriv"
        have_libpng="yes (libpng-config)"
        AC_MSG_RESULT([yes])
      else
        AC_MSG_RESULT([no])
      fi

Autoconf has a generic macro to find a command, AC_CHECK_PROG(). By using it, configure.raw can reduce its size slightly.

      # fall back to config script
      AC_CHECK_PROG(have_libpng, [libpng-config], [yes (libpng-config)], [no])
      if test "$have_libpng" != no; then
        LIBPNG_CFLAGS=`libpng-config --cflags`
        LIBPNG_LIBS=`libpng-config --ldflags`
        libpng_libspriv=`libpng-config --static --ldflags`
        libpng_libsstaticconf="$libpng_libspriv"
      fi

Merge request reports