minor cleanup

git-svn-id: svn://tug.org/texlive/trunk@17034 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 15 insertions, 6 deletions

diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog
index 6fe108df272..f0259e6e9e4 100644
--- a/Build/source/texk/dvidvi/ChangeLog
+++ b/Build/source/texk/dvidvi/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/dvidvi/Makefile.am b/Build/source/texk/dvidvi/Makefile.am
index f775760af71..714d1951087 100644
--- a/Build/source/texk/dvidvi/Makefile.am
+++ b/Build/source/texk/dvidvi/Makefile.am
@@ -1,14 +1,12 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvidvi/
 ##
-## 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 = -DKPATHSEA -DUNIX
-## We don't use libkpathsea, so don't overload fopen and stuff.
-AM_CPPFLAGS += -DNO_DEBUG
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 bin_PROGRAMS = dvidvi
diff --git a/Build/source/texk/dvidvi/Makefile.in b/Build/source/texk/dvidvi/Makefile.in
index 1436161552e..bc5b3abe5ff 100644
--- a/Build/source/texk/dvidvi/Makefile.in
+++ b/Build/source/texk/dvidvi/Makefile.in
@@ -242,7 +242,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -DUNIX -DNO_DEBUG
+AM_CPPFLAGS = -DKPATHSEA -DUNIX
 AM_CFLAGS = $(WARNING_CFLAGS)
 dvidvi_SOURCES = dvidvi.c
 dist_man1_MANS = dvidvi.1
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index d61f8801bcc..846f7ab8b58 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -11388,6 +11388,10 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 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)`
@@ -12799,6 +12803,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/dvidvi/configure.ac b/Build/source/texk/dvidvi/configure.ac
index 890380db105..86d5fded46c 100644
--- a/Build/source/texk/dvidvi/configure.ac
+++ b/Build/source/texk/dvidvi/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,
@@ -17,7 +17,8 @@ KPSE_COMMON([dvidvi])
 
 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])