summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-libpng-flags.m4
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/m4/kpse-libpng-flags.m4')
-rw-r--r--Build/source/m4/kpse-libpng-flags.m417
1 files changed, 5 insertions, 12 deletions
diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4
index a2bb76c6814..a832e96a621 100644
--- a/Build/source/m4/kpse-libpng-flags.m4
+++ b/Build/source/m4/kpse-libpng-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -13,8 +13,8 @@
#
# Set the make variables LIBPNG_INCLUDES and LIBPNG_LIBS to the CPPFLAGS and
# LIBS required for the `-lpng' library in libs/libpng/ of the TL tree.
-AC_DEFUN([KPSE_LIBPNG_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_DEFUN([KPSE_LIBPNG_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([libpng], [png], [],
[-IBLD/libs/libpng/include], [BLD/libs/libpng/libpng.a], [],
[], [${top_builddir}/../../libs/libpng/include/png.h])[]dnl
@@ -26,12 +26,5 @@ AC_DEFUN([KPSE_LIBPNG_OPTIONS], [_KPSE_LIB_OPTIONS([libpng], [$1], [pkg-config])
# KPSE_LIBPNG_SYSTEM_FLAGS
# ------------------------
-AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
-if $PKG_CONFIG libpng; then
- LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags`
- LIBPNG_LIBS=`$PKG_CONFIG libpng --libs`
-elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then
- AC_MSG_ERROR([did not find libpng])
-fi
-]) # KPSE_LIBPNG_SYSTEM_FLAGS
+AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], [dnl
+_KPSE_PKG_CONFIG_FLAGS([libpng], [libpng])])