From b789d9d640329830153fd0b4ec23c7545100969b Mon Sep 17 00:00:00 2001
From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Thu, 23 Apr 2009 16:33:37 +0000
Subject: build system cleanup

git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/m4/kpse-libpng-flags.m4 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'Build/source/m4/kpse-libpng-flags.m4')

diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4
index acf9929d3fe..9a1e2a974ee 100644
--- a/Build/source/m4/kpse-libpng-flags.m4
+++ b/Build/source/m4/kpse-libpng-flags.m4
@@ -1,4 +1,4 @@
-# Public macros for the teTeX / TeX Live (TL) tree.
+# Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
@@ -7,8 +7,8 @@
 
 # serial 0
 
-# KPSE_LIBPNG_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
-# --------------------------------------------------
+# KPSE_LIBPNG_FLAGS
+# -----------------
 # Provide the configure options '--with-system-libpng' (if in the TL tree),
 # '--with-libpng-includes', and '--with-libpng-libdir'.
 #
@@ -16,14 +16,15 @@
 # LIBS required for the `-lpng' library in libs/libpng/ of the TL tree.
 AC_DEFUN([KPSE_LIBPNG_FLAGS],
 [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([libpng], [png],
-                 [$1],
-                 [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [],
-                 [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl
+_KPSE_LIB_FLAGS([libpng], [png], [],
+                [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [],
+                [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl
 ]) # KPSE_LIBPNG_FLAGS
 
+# KPSE_LIBPNG_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_LIBPNG_OPTIONS], [_KPSE_LIB_OPTIONS([libpng], [$1])])
+
 # KPSE_LIBPNG_SYSTEM_FLAGS
 # ------------------------
-AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS],
-[_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])[]dnl
-]) # KPSE_LIBPNG_SYSTEM_FLAGS
+AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([libpng], [png])])
-- 
cgit v1.2.3