summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-zziplib-flags.m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-25 09:40:23 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-25 09:40:23 +0000
commitb1694b996be79022b025714fcb6c142724f222d1 (patch)
tree408e0dcc2f16bd77389ac76f585c8fec15bfbcb6 /Build/source/m4/kpse-zziplib-flags.m4
parent7a6aebddcdcee697b010d2b6d0db9b7b43e826b5 (diff)
m4: Clean up Autoconf macros
git-svn-id: svn://tug.org/texlive/trunk@33282 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-zziplib-flags.m4')
-rw-r--r--Build/source/m4/kpse-zziplib-flags.m430
1 files changed, 14 insertions, 16 deletions
diff --git a/Build/source/m4/kpse-zziplib-flags.m4 b/Build/source/m4/kpse-zziplib-flags.m4
index 064908f19f9..e2197defb40 100644
--- a/Build/source/m4/kpse-zziplib-flags.m4
+++ b/Build/source/m4/kpse-zziplib-flags.m4
@@ -1,40 +1,38 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_ZZIPLIB_FLAGS
-# -----------------
+# ------------------
# Provide the configure options '--with-system-zziplib' (if in the TL tree),
# '--with-zziplib-includes', and '--with-zziplib-libdir'.
#
# Set the make variables ZZIPLIB_INCLUDES and ZZIPLIB_LIBS to the CPPFLAGS and
# LIBS required for the `-lpng' library in libs/zziplib/ of the TL tree.
-AC_DEFUN([KPSE_ZZIPLIB_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+AC_DEFUN([KPSE_ZZIPLIB_FLAGS], [dnl
+AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
_KPSE_LIB_FLAGS([zziplib], [zzip], [],
[-IBLD/libs/zziplib/include], [BLD/libs/zziplib/libzzip.a], [],
[], [${top_builddir}/../../libs/zziplib/include/zzip/zzip.h])[]dnl
]) # KPSE_ZZIPLIB_FLAGS
# KPSE_ZZIPLIB_OPTIONS([WITH-SYSTEM])
-# ----------------------------------
-AC_DEFUN([KPSE_ZZIPLIB_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-zziplib],
- AS_HELP_STRING([--with-system-zziplib],
- [use installed zziplib headers and library
- (requires pkg-config)]))])[]dnl
+# -----------------------------------
+AC_DEFUN([KPSE_ZZIPLIB_OPTIONS], [dnl
+m4_ifval([$1],
+ [AC_ARG_WITH([system-zziplib],
+ AS_HELP_STRING([--with-system-zziplib],
+ [use installed zziplib headers and library
+ (requires pkg-config)]))])[]dnl
]) # KPSE_ZZIPLIB_OPTIONS
# KPSE_ZZIPLIB_SYSTEM_FLAGS
-# ------------------------
-AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS],
-[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+# -------------------------
+AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
if $PKG_CONFIG zziplib --atleast-version=0.12; then
ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`