summaryrefslogtreecommitdiff
path: root/Build/source/texk/dtl
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-15 08:19:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-15 08:19:27 +0000
commit5ad5b475cc0211e3d48232660a9f1548ac2aadb5 (patch)
tree8828e1ca68606e563aede87ea2a699fcf60c8543 /Build/source/texk/dtl
parentb9a895c295af055dfbc9599c2a763ed0d443d109 (diff)
minor cleanup
git-svn-id: svn://tug.org/texlive/trunk@17034 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dtl')
-rw-r--r--Build/source/texk/dtl/ChangeLog5
-rw-r--r--Build/source/texk/dtl/Makefile.am4
-rw-r--r--Build/source/texk/dtl/Makefile.in2
-rwxr-xr-xBuild/source/texk/dtl/configure5
-rw-r--r--Build/source/texk/dtl/configure.ac5
5 files changed, 15 insertions, 6 deletions
diff --git a/Build/source/texk/dtl/ChangeLog b/Build/source/texk/dtl/ChangeLog
index 5f53644a043..86588af72a0 100644
--- a/Build/source/texk/dtl/ChangeLog
+++ b/Build/source/texk/dtl/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CPPFLAGS): Remove '-DNO_DEBUG' ...
+ * configure.ac: ... now added via KPSE_KPATHSEA_FLAGS.
+
2009-08-21 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid maximal compiler warnings.
diff --git a/Build/source/texk/dtl/Makefile.am b/Build/source/texk/dtl/Makefile.am
index a153d861fe4..02b472d6f82 100644
--- a/Build/source/texk/dtl/Makefile.am
+++ b/Build/source/texk/dtl/Makefile.am
@@ -1,14 +1,12 @@
## Makefile.am for the TeX Live subdirectory texk/dtl/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DUNIX -DKPATHSEA
-## We don't use libpathsea, so don't overload fopen and stuff
-AM_CPPFLAGS += -DNO_DEBUG
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dt2dv dv2dt
diff --git a/Build/source/texk/dtl/Makefile.in b/Build/source/texk/dtl/Makefile.in
index 134ab8c8d63..55115f44072 100644
--- a/Build/source/texk/dtl/Makefile.in
+++ b/Build/source/texk/dtl/Makefile.in
@@ -247,7 +247,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DNO_DEBUG
+AM_CPPFLAGS = -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
dt2dv_SOURCES = dt2dv.c dtl.h
dist_man1_MANS = dt2dv.man dv2dt.man
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index 081c9df0a37..47137b4815b 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -11633,6 +11633,10 @@ _ACEOF
ac_config_headers="$ac_config_headers config.h"
+# We don't use libpathsea, so add '-DNO_DEBUG' not to overload fopen.
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+
## _KPSE_INIT: Initialize TL infrastructure
kpse_BLD=`(cd "./../../." && pwd)`
kpse_SRC=`(cd "$srcdir/../../." && pwd)`
@@ -13044,6 +13048,7 @@ ${top_builddir}/../kpathsea/paths.h:
cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/dtl/configure.ac b/Build/source/texk/dtl/configure.ac
index 218535ef1af..6d44c571dea 100644
--- a/Build/source/texk/dtl/configure.ac
+++ b/Build/source/texk/dtl/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,8 @@ AC_CHECK_SIZEOF(long)
AC_CONFIG_HEADERS([config.h])
-KPSE_KPATHSEA_FLAGS
+# We don't use libpathsea, so add '-DNO_DEBUG' not to overload fopen.
+KPSE_KPATHSEA_FLAGS([no-debug])
AC_CONFIG_FILES([Makefile])