Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 487138 | Differences between
and this patch

Collapse All | Expand All

(-)a/builds/unix/configure.ac (-12 / +3 lines)
Lines 69-74 AC_SUBST(EXEEXT_BUILD) Link Here
69
# auxiliary programs
69
# auxiliary programs
70
70
71
AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
71
AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
72
PKG_PROG_PKG_CONFIG
72
73
73
74
74
# Since this file will be finally moved to another directory we make
75
# Since this file will be finally moved to another directory we make
Lines 286-303 AC_ARG_WITH([png], Link Here
286
  AS_HELP_STRING([--without-png],
287
  AS_HELP_STRING([--without-png],
287
                 [do not support png compressed OpenType embedded bitmaps]))
288
                 [do not support png compressed OpenType embedded bitmaps]))
288
if test x$with_png != xno; then
289
if test x$with_png != xno; then
289
  AC_MSG_CHECKING([for libpng])
290
  PKG_CHECK_MODULES(LIBPNG, libpng)
290
  if test -z "$LIBPNG_CFLAGS" -a -z "$LIBPNG_LDFLAGS"; then
291
    if ! which libpng-config >/dev/null; then
292
      AC_MSG_ERROR([`libpng-config' not found;
293
either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
294
or pass `--without-png' to the `configure' script.])
295
    fi
296
    LIBPNG_CFLAGS="`libpng-config --cflags`"
297
    LIBPNG_LDFLAGS="`libpng-config --ldflags`"
298
  fi
299
  HAVE_LIBPNG=yes
291
  HAVE_LIBPNG=yes
300
  AC_MSG_RESULT([$LIBPNG_LDFLAGS])
301
fi
292
fi
302
293
303
294
Lines 739-745 if test x$SYSTEM_LIBBZ2 = xyes; then Link Here
739
fi
730
fi
740
if test x$HAVE_LIBPNG = xyes; then
731
if test x$HAVE_LIBPNG = xyes; then
741
  CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
732
  CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"
742
  LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
733
  LDFLAGS="$LDFLAGS $LIBPNG_LIBS"
743
fi
734
fi
744
735
745
AC_SUBST([CFLAGS])
736
AC_SUBST([CFLAGS])

Return to bug 487138