summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 10:10:33 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 10:10:33 +0000
commita01f17b2387fe42f2578c94d964f39a1e58a1e6f (patch)
tree35caca6e3445de157ed263a649f7bc0e1718abbe /Build/source/m4
parent8e1591c3c2bdfbf2a10c43d6c91d9bebcdc39707 (diff)
build system: move zziplib back to libs/
git-svn-id: svn://tug.org/texlive/trunk@16891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-cxx-hack.m417
-rw-r--r--Build/source/m4/kpse-freetype2-flags.m42
-rw-r--r--Build/source/m4/kpse-graphite-flags.m44
-rw-r--r--Build/source/m4/kpse-icu-flags.m44
-rw-r--r--Build/source/m4/kpse-xpdf-flags.m44
-rw-r--r--Build/source/m4/kpse-zziplib-flags.m444
6 files changed, 57 insertions, 18 deletions
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
index 9beec894270..17ec949b63b 100644
--- a/Build/source/m4/kpse-cxx-hack.m4
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -1,6 +1,6 @@
# Public macros for the TeX Live (TL) tree.
# Copyright (C) 2002 Olaf Weber <olaf@infovore.xs4all.nl>
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holders
# give unlimited permission to copy and/or distribute it,
@@ -20,8 +20,7 @@ AC_DEFUN([KPSE_ENABLE_CXX_HACK],
# KPSE_CXX_HACK()
# ---------------
-# Try statically linking C++ runtime library (g++ only)
-# and define CXX_HACK_LIBS with required flags.
+# Try statically linking C++ runtime library (g++ only).
# Since Libtool reshuffles the argument list, we define CXXLD
# as wrapper script appending these flags to g++ as invoked
# by Libtool when linking progams (but not shared libraries).
@@ -35,22 +34,18 @@ if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then
fi
if test "x$kpse_cv_cxx_hack" = xok; then
CXXLD='$(top_builddir)/CXXLD.sh'
- CXX_HACK_DEPS=$CXXLD
- CXX_HACK_LIBS=$kpse_cv_cxx_flags
cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
# CXXLD.sh. Generated by configure.
-set -- $CXX \"\$[]@\" $CXX_HACK_LIBS
+set -- $CXX \"\$[]@\" $kpse_cv_cxx_flags
echo \"\$[]0:\" \"\$[]@\"
exec \"\$[]@\""
- AC_CONFIG_FILES([CXXLD.sh:README],
- [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh],
- [cxxld_sh='$cxxld_sh'])
+ AC_CONFIG_COMMANDS([CXXLD.sh],
+ [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh],
+ [cxxld_sh='$cxxld_sh'])
else
CXXLD='$(CXX)'
fi
AC_SUBST([CXXLD])
-AC_SUBST([CXX_HACK_DEPS])
-AC_SUBST([CXX_HACK_LIBS])
]) # KPSE_CXX_HACK
# _KPSE_CXX_HACK()
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 0216f7bcdfe..40d4e2a6fb0 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -40,7 +40,7 @@ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
fi
]) # KPSE_FREETYPE2_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-graphite-flags.m4 b/Build/source/m4/kpse-graphite-flags.m4
index cb012ccf265..cf532b0b03d 100644
--- a/Build/source/m4/kpse-graphite-flags.m4
+++ b/Build/source/m4/kpse-graphite-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,7 @@ AC_DEFUN([KPSE_GRAPHITE_SYSTEM_FLAGS],
if $PKG_CONFIG silgraphite --atleast-version=2.3; then
GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`"
GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs`
-elif test "x$need_graphite:$with_system_graphite" = 'xyes:yes'; then
+elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then
AC_MSG_ERROR([did not find silgraphite 2.3 or better])
fi
]) # KPSE_GRAPHITE_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index 6b966d4468c..4bbee4f6fbd 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -62,7 +62,7 @@ if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath m4_ifset([kpse_icu_config_args],
[kpse_icu_config_args] )--ldflags-libsonly --ldflags-system`
-elif test "x$need_icu:$with_system_icu" = 'xyes:yes'; then
+elif test "x$need_icu:$with_system_icu" = xyes:yes; then
AC_MSG_ERROR([did not find icu-config required for system icu libraries])
fi
]) # KPSE_ICU_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index 680c41baad8..993bd792f16 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@ if $PKG_CONFIG poppler --atleast-version=0.10; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
+elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
AC_MSG_ERROR([did not find poppler-0.10 or better])
fi
]) # KPSE_XPDF_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-zziplib-flags.m4 b/Build/source/m4/kpse-zziplib-flags.m4
new file mode 100644
index 00000000000..064908f19f9
--- /dev/null
+++ b/Build/source/m4/kpse-zziplib-flags.m4
@@ -0,0 +1,44 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2010 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
+_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
+]) # KPSE_ZZIPLIB_OPTIONS
+
+# KPSE_ZZIPLIB_SYSTEM_FLAGS
+# ------------------------
+AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS],
+[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`
+elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+ AC_MSG_ERROR([did not find zziplib-0.12 or better])
+fi
+]) # KPSE_ZZIPLIB_SYSTEM_FLAGS