summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
commite981cdbd1662ed82436259f1046987c5b7204f1a (patch)
tree031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/texk/dvipng
parent3ad3db6624b55ad14658410f68ab6cb878904c7c (diff)
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros, Avoid unnecessary use of Libtool, Use z_const git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r--Build/source/texk/dvipng/ChangeLog9
-rw-r--r--Build/source/texk/dvipng/Makefile.am2
-rw-r--r--Build/source/texk/dvipng/Makefile.in1
-rwxr-xr-xBuild/source/texk/dvipng/configure31
-rw-r--r--Build/source/texk/dvipng/configure.ac2
-rw-r--r--Build/source/texk/dvipng/m4/gs-device.m431
-rw-r--r--Build/source/texk/dvipng/m4/makeinfo.m483
7 files changed, 74 insertions, 85 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index eede51b66d7..9add50dd773 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * gs-device.m4, makeinfo.m4: Slightly rewrite, update Copyright.
+
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, doc/Makefile.am:
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 641a39d92d6..d382ac58fb6 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -10,8 +10,6 @@
#
#************************************************************************
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
## We want to re-distribute the whole original dvipng source tree.
##
## With current automake (1.10.2) 'make distcheck' fails when
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 33c42843e63..ffcd12b84f4 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -628,7 +628,6 @@ top_srcdir = @top_srcdir@
# Copyright (C) 2002-2008 Jan-Åke Larsson
#
#************************************************************************
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \
dvipng-test.dvi
AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 0d501ada4ed..2eb91bcc143 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -14457,25 +14457,24 @@ $as_echo "no" >&6; }
fi
-for ac_macro in acronym env option; do
- if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MAKEINFO understands @$ac_macro{}" >&5
+if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
+ for ac_macro in acronym env option; do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MAKEINFO understands @$ac_macro{}" >&5
$as_echo_n "checking if $MAKEINFO understands @$ac_macro{}... " >&6; }
- echo \\\\input texinfo > conftest.texi
- echo @$ac_macro{test} >> conftest.texi
- if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+echo \\\\input texinfo > conftest.texi
+echo @$ac_macro{test} >> conftest.texi
+if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
-
- fi
- rm -f conftest.texi conftest.info
+ AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
fi
+rm -f conftest.texi conftest.info
-done
+ done
+fi
# Extract the first word of "install-info", so it can be a program name with args.
@@ -16283,8 +16282,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 5a42a748d86..488fb866063 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -18,7 +18,7 @@ AC_INIT([dvipng (TeX Live)], dvipng_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([dvipng-]dvipng_version[/dvipng.c])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
# Common code for all programs using libkpathsea.
KPSE_COMMON([dvipng])
diff --git a/Build/source/texk/dvipng/m4/gs-device.m4 b/Build/source/texk/dvipng/m4/gs-device.m4
index 77d34808f7e..6b726f2e91f 100644
--- a/Build/source/texk/dvipng/m4/gs-device.m4
+++ b/Build/source/texk/dvipng/m4/gs-device.m4
@@ -1,23 +1,18 @@
-# gs-device.m4 - Macros to check for GS devices.
-## Copyright (C) 20xx Some One <someone@somewhere.net>
-## Some affiliation
-##
-## Notice:
-## I extracted these macros from aclocal.m4 in the dvipng-1.12 distribution
-## and renamed one in order not to violate the Autoconf (AC_) namespace.
-## 26 Mar 2008, 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 1
+# Autoconf macros for dvipng.
+# Copyright (C) 2002-2010 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# Extracted from dvipng-1.12/aclocal.m4 and adapted for use in TeX Live.
# GS_CHECK_DEVICES
# ----------------
# Check GS (ghostscript) devices.
-AC_DEFUN([GS_CHECK_DEVICES],
-[GS_WARN=
+AC_DEFUN([GS_CHECK_DEVICES], [dnl
+GS_WARN=
_GS_HAS_DEVICE([pngalpha],
[GS_WARN="Your EPS inclusions will be cropped to the
boundingbox, and rendered on an opaque background.
@@ -34,8 +29,8 @@ fi
# ----------------------------------------
# Internal subroutine. Check if GS has the device DEVICE and
# execute the shell code ACTION-IF-FAILED if not.
-m4_define([_GS_HAS_DEVICE],
-[AC_MSG_CHECKING([whether $GS has the $1 device])
+m4_define([_GS_HAS_DEVICE], [dnl
+AC_MSG_CHECKING([whether $GS has the $1 device])
if $GS -h | grep $1 >/dev/null; then
AC_MSG_RESULT([yes])
else
diff --git a/Build/source/texk/dvipng/m4/makeinfo.m4 b/Build/source/texk/dvipng/m4/makeinfo.m4
index 86d52d2e495..0ddff45ecde 100644
--- a/Build/source/texk/dvipng/m4/makeinfo.m4
+++ b/Build/source/texk/dvipng/m4/makeinfo.m4
@@ -1,52 +1,41 @@
-# makeinfo.m4 - Macros to determine makeinfo features.
-## Copyright (C) 20xx Some One <someone@somewhere.net>
-## Some affiliation
-##
-## Temporary notice:
-## I extracted these macros from aclocal.m4 in the dvipng-1.9 distribution
-## and slightly modified them for use with Automake.
-## 26 Mar 2008, 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.
+# Autoconf macros for dvipng.
+# Copyright (C) 2002-2008 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+# Copyright (C) 2008-2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# Extracted from dvipng-1.9/aclocal.m4 and adapted for use in TeX Live.
-# serial 1
-
-# MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ----------------------------------------------------------------------
-# Check if makeinfo understands the macro @MACRO{}. Execute the shell
-# code ACTION-IF-FOUND if so, or ACTION-IF-NOT-FOUND otherwise.
-AC_DEFUN([MAKEINFO_CHECK_MACRO],
-[if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
- AC_MSG_CHECKING([if $MAKEINFO understands @$1{}])
- echo \\\\input texinfo > conftest.texi
- echo @$1{test} >> conftest.texi
- if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
- AC_MSG_RESULT(yes)
- m4_ifval([$2], [$2
-])[]dnl
- else
- AC_MSG_RESULT(no)
- m4_ifval([$3], [$3
-])[]dnl
- fi
- rm -f conftest.texi conftest.info
+# MAKEINFO_CHECK_MACROS(MACRO ...)
+# --------------------------------
+# For each MACRO check if makeinfo understands @MACRO{}.
+# Prepend '-D no-MACRO' for each MACRO not understood to the
+# output variable AM_MAKEINFOFLAGS.
+AC_DEFUN([MAKEINFO_CHECK_MACROS], [dnl
+if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
+ for ac_macro in $1; do
+ _MAKEINFO_CHECK_MACRO([$ac_macro])
+ done
fi
-])# MAKEINFO_CHECK_MACRO
-
-# MAKEINFO_CHECK_MACROS( MACRO ..., [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ----------------------------------------------------------------------------
-# For each MACRO check if makeinfo understands @MACRO{}. Execute the shell
-# code ACTION-IF-FOUND for each macro understood, or ACTION-IF-NOT-FOUND
-# for each macro not understood. Prepend '-D no-MACRO' for each MACRO
-#not understood to the output variable AM_MAKEINFOFLAGS.
-AC_DEFUN([MAKEINFO_CHECK_MACROS],
-[for ac_macro in $1; do
- MAKEINFO_CHECK_MACRO([$ac_macro], [$2],
- [AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
- $3])
-done
AC_SUBST([AM_MAKEINFOFLAGS])
])# MAKEINFO_CHECK_MACROS
+# _MAKEINFO_CHECK_MACRO(MACRO)
+# ----------------------------
+# Internal subroutine. Check if makeinfo understands @MACRO{}
+# and prepend '-D no-MACRO' to AM_MAKEINFOFLAGS if not.
+m4_define([_MAKEINFO_CHECK_MACRO], [dnl
+AC_MSG_CHECKING([if $MAKEINFO understands @$1{}])
+echo \\\\input texinfo > conftest.texi
+echo @$1{test} >> conftest.texi
+if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AM_MAKEINFOFLAGS="-D no-$1 $AM_MAKEINFOFLAGS"
+fi
+rm -f conftest.texi conftest.info
+])# _MAKEINFO_CHECK_MACRO
+