diff options
Diffstat (limited to 'Build')
46 files changed, 955 insertions, 84 deletions
diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure index 370809ef4d4..5966e08f904 100755 --- a/Build/source/texk/afm2pl/configure +++ b/Build/source/texk/afm2pl/configure @@ -11445,6 +11445,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12856,12 +12859,44 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS -if test "x$enable_build" != xno || test -f config.force; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS + +if test "x$enable_build" != xno || test -f config.force; then eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure index 302b5b0f27f..d5713dea01a 100755 --- a/Build/source/texk/bibtex8/configure +++ b/Build/source/texk/bibtex8/configure @@ -11379,6 +11379,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags ac_config_headers="$ac_config_headers config.h" +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12790,6 +12793,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure index b613eb82f2a..c9985573f02 100755 --- a/Build/source/texk/bibtexu/configure +++ b/Build/source/texk/bibtexu/configure @@ -15562,6 +15562,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -17236,6 +17239,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index 3deeeb51441..9fa578aa1fb 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -11472,6 +11472,9 @@ if test "x$ac_cv_func_strdup" = xno; then fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12883,12 +12886,44 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS -if test "x$enable_build" != xno || test -f config.force; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS + +if test "x$enable_build" != xno || test -f config.force; then eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure index 87fcac40ac0..233fef68cdd 100755 --- a/Build/source/texk/detex/configure +++ b/Build/source/texk/detex/configure @@ -11584,6 +11584,9 @@ fi ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12995,6 +12998,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" 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]) diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog index 06a9ba33e49..e5c84b44fda 100644 --- a/Build/source/texk/dvi2tty/ChangeLog +++ b/Build/source/texk/dvi2tty/ChangeLog @@ -1,3 +1,7 @@ +2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * disdvi.c, dvi2tty.h: #define NO_DEBUG as 1, to avoid warning. + 2009-08-23 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid maximal compiler warnings. diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index 0a04fc239af..859b7ace552 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -11388,6 +11388,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12799,6 +12802,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/dvi2tty/disdvi.c b/Build/source/texk/dvi2tty/disdvi.c index 1296f26f174..b65c3ed514b 100644 --- a/Build/source/texk/dvi2tty/disdvi.c +++ b/Build/source/texk/dvi2tty/disdvi.c @@ -21,7 +21,7 @@ char *disdvi = "@(#) disdvi.c 2.1 19/01/90 M.J.E. Mol (c) 1989, 1990"; #include "commands.h" #if defined(KPATHSEA) -#define NO_DEBUG +#define NO_DEBUG 1 #include <kpathsea/config.h> #include <kpathsea/lib.h> #else diff --git a/Build/source/texk/dvi2tty/dvi2tty.h b/Build/source/texk/dvi2tty/dvi2tty.h index 5a31a610d8f..19225a823d3 100644 --- a/Build/source/texk/dvi2tty/dvi2tty.h +++ b/Build/source/texk/dvi2tty/dvi2tty.h @@ -14,7 +14,7 @@ Copyright (C) 1988 M.J.E. Mol 1989, 1990" #endif #if defined(KPATHSEA) -#define NO_DEBUG +#define NO_DEBUG 1 #include <kpathsea/config.h> #endif 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]) diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index 2290105497e..61c4af56dc1 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -11637,6 +11637,9 @@ fi done +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13048,6 +13051,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 74c6ff582ce..a3704a897c7 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -12436,6 +12436,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13847,6 +13850,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags @@ -13931,9 +13969,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index faf9aa8ec13..f2d234a7d8e 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -13309,6 +13309,9 @@ fi # libraries or unistalled (possibly libtool) ones from the TeX Live tree. # Thus we can not use, e.g., AC_CHECK_LIB(LIB, FUNCTION) +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -14720,6 +14723,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags @@ -15011,9 +15049,6 @@ have_ft2=yes if test "x$enable_build" != xno || test -f config.force; then # Checks for more libraries. -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index 75d1ae84947..85f259b9192 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -11445,6 +11445,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12856,6 +12859,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index 3e635d54770..6570b6b885c 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -11664,6 +11664,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13075,6 +13078,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 0a302af1169..0eac90745e3 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -15784,6 +15784,9 @@ fi done +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -17458,6 +17461,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index 21bccde5e36..c7458e04845 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -11822,6 +11822,9 @@ done fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13233,12 +13236,44 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS -if test "x$enable_build" != xno || test -f config.force; then +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS + +if test "x$enable_build" != xno || test -f config.force; then eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 21021e75d96..0ecbbcf1267 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -8,6 +8,18 @@ (<kpathsea/c-pathmx.h>) [__DJGPP__]: change conditional from DJGPP. Suggestion from Javier Mugica, 13 Feb 2010 20:46:12. +2010-02-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * xopendir.c [WIN32]: Define neither xopendir nor xclosedir. + * mingw32.[ch], progname.c: Remove set_home_warning(). + From Akira. + + * xopendir.[ch] (xopendir): Declare string param as const. + Declare prototypes if and only if functions are defined. + + * kdefault.c, tex-file.h, xputenv.c: + Formatting, trailing whitespace. + 2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de> * dir.c (kpathsea_dir_p), elt-dirs.c (kpathsea_normalize_path), diff --git a/Build/source/texk/kpathsea/kdefault.c b/Build/source/texk/kpathsea/kdefault.c index 43b79965ee5..52493d90560 100644 --- a/Build/source/texk/kpathsea/kdefault.c +++ b/Build/source/texk/kpathsea/kdefault.c @@ -28,17 +28,17 @@ /* Check for leading colon first, then trailing, then doubled, since that is fastest. Usually it will be leading or trailing. */ -string -kpathsea_expand_default (kpathsea kpse, const_string path, +string +kpathsea_expand_default (kpathsea kpse, const_string path, const_string fallback) { unsigned path_length; string expansion; (void)kpse; /* currenty not used */ - + /* The default path better not be null. */ assert (fallback); - + if (path == NULL) expansion = xstrdup (fallback); @@ -81,11 +81,11 @@ kpathsea_expand_default (kpathsea kpse, const_string path, expansion = xstrdup(path); } } - + return expansion; } #if defined (KPSE_COMPAT_API) -string +string kpse_expand_default (const_string path, const_string fallback) { return kpathsea_expand_default (kpse_def, path, fallback); @@ -99,7 +99,7 @@ void test_expand_default (const_string path, const_string def) { string answer; - + printf ("Expansion of `%s':\t", path ? path : "(nil)"); answer = kpse_expand_default (path, def); puts (answer); @@ -117,8 +117,8 @@ main () test_expand_default (ENV_SEP_STRING "first", default_path); test_expand_default ("last" ENV_SEP_STRING, default_path); test_expand_default ("middle" ENV_SEP_STRING ENV_SEP_STRING "elddim", - default_path); - + default_path); + return 0; } diff --git a/Build/source/texk/kpathsea/mingw32.c b/Build/source/texk/kpathsea/mingw32.c index da08a469437..430c97caf62 100644 --- a/Build/source/texk/kpathsea/mingw32.c +++ b/Build/source/texk/kpathsea/mingw32.c @@ -74,12 +74,6 @@ init_user_info (void) } } -/* This function could go away */ -void -set_home_warning (void) -{ -} - /* Returns the home directory, in external format */ static char * get_home_directory (void) diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h index c8c492a8b94..3d7270a2cd0 100644 --- a/Build/source/texk/kpathsea/mingw32.h +++ b/Build/source/texk/kpathsea/mingw32.h @@ -45,7 +45,6 @@ #ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ extern void init_user_info (void); -extern void set_home_warning (void); extern BOOL win32_get_long_filename (char *, char *, int); extern BOOL look_for_cmd (const char *, char **); extern char *quote_args(char **); diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h index f752c399b14..076edcc57b6 100644 --- a/Build/source/texk/kpathsea/tex-file.h +++ b/Build/source/texk/kpathsea/tex-file.h @@ -33,8 +33,8 @@ extern void kpathsea_init_fallback_resolutions (kpathsea kpse, string envvar); #endif /* MAKE_KPSE_DLL */ /* If LEVEL is >= FMT's `program_enable_level', set `program_enabled_p' - for FMT to VALUE. */ -extern KPSEDLL void kpathsea_set_program_enabled (kpathsea kpse, + for FMT to VALUE. */ +extern KPSEDLL void kpathsea_set_program_enabled (kpathsea kpse, kpse_file_format_type fmt, boolean value, kpse_src_type level); /* Call kpse_set_program_enabled with VALUE and the format corresponding @@ -44,13 +44,13 @@ extern KPSEDLL void kpathsea_maketex_option (kpathsea kpse, /* Change the list of searched suffixes for FORMAT to ... (alternate suffixes if ALTERNATE is true). */ -extern KPSEDLL void kpathsea_set_suffixes (kpathsea kpse, +extern KPSEDLL void kpathsea_set_suffixes (kpathsea kpse, kpse_file_format_type format, boolean alternate, ...); /* Initialize the info for the given format. This is called automatically by `kpse_find_file', but the glyph searching (for example) can't use that function, so make it available. */ -extern KPSEDLL const_string kpathsea_init_format (kpathsea kpse, +extern KPSEDLL const_string kpathsea_init_format (kpathsea kpse, kpse_file_format_type format); /* If FORMAT has a non-null `suffix' member, append it to NAME "." @@ -68,22 +68,22 @@ extern KPSEDLL string *kpathsea_find_file_generic (kpathsea kpse, /* Return true if FNAME is acceptable to open for reading or writing. If not acceptable, write a message to stderr. */ extern KPSEDLL boolean kpathsea_in_name_ok (kpathsea kpse, const_string fname); -extern KPSEDLL boolean kpathsea_out_name_ok (kpathsea kpse,const_string fname); +extern KPSEDLL boolean kpathsea_out_name_ok (kpathsea kpse, const_string fname); /* As above, but no error message. */ extern KPSEDLL boolean kpathsea_in_name_ok_silent (kpathsea kpse, const_string fname); extern KPSEDLL boolean kpathsea_out_name_ok_silent - (kpathsea kpse,const_string fname); + (kpathsea kpse, const_string fname); /* Don't just look up the name, actually open the file. */ -extern KPSEDLL FILE *kpathsea_open_file (kpathsea kpse, const_string name, +extern KPSEDLL FILE *kpathsea_open_file (kpathsea kpse, const_string name, kpse_file_format_type format); /* This function is used to set kpse_program_name (from progname.c) to a different value. It will clear the path searching information, to ensure that the search paths are appropriate to the new name. */ -extern KPSEDLL void kpathsea_reset_program_name (kpathsea kpse, +extern KPSEDLL void kpathsea_reset_program_name (kpathsea kpse, const_string progname); diff --git a/Build/source/texk/kpathsea/xopendir.c b/Build/source/texk/kpathsea/xopendir.c index e948eb90131..adf81d67b87 100644 --- a/Build/source/texk/kpathsea/xopendir.c +++ b/Build/source/texk/kpathsea/xopendir.c @@ -1,6 +1,6 @@ /* xopendir.c: opendir and closedir with error checking. - Copyright 1992, 1993, 1994, 1995, 1996, 2008 Karl Berry. + Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2010 Karl Berry. Copyright 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #if !defined(WIN32) || defined(__MINGW32__) DIR * -xopendir (string dirname) +xopendir (const_string dirname) { DIR *d = opendir(dirname); @@ -31,7 +31,6 @@ xopendir (string dirname) return d; } -#endif /* not WIN32 */ void xclosedir (DIR *d) @@ -45,4 +44,4 @@ xclosedir (DIR *d) FATAL("closedir failed"); #endif } - +#endif /* not WIN32 || __MINGW32__ */ diff --git a/Build/source/texk/kpathsea/xopendir.h b/Build/source/texk/kpathsea/xopendir.h index aceebffaa40..b786d9a89ee 100644 --- a/Build/source/texk/kpathsea/xopendir.h +++ b/Build/source/texk/kpathsea/xopendir.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined (KPATHSEA_XOPENDIR_H) && !defined (WIN32) +#if !defined (KPATHSEA_XOPENDIR_H) && (!defined (WIN32) || defined(__MINGW32__)) #define KPATHSEA_XOPENDIR_H #include <kpathsea/c-dir.h> @@ -25,7 +25,7 @@ #ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ /* Like opendir and closedir, but abort on error. */ -extern DIR *xopendir (string dirname); +extern DIR *xopendir (const_string dirname); extern void xclosedir (DIR *); #endif /* MAKE_KPSE_DLL */ diff --git a/Build/source/texk/kpathsea/xputenv.c b/Build/source/texk/kpathsea/xputenv.c index 0455997890d..4d1fb5335e0 100644 --- a/Build/source/texk/kpathsea/xputenv.c +++ b/Build/source/texk/kpathsea/xputenv.c @@ -47,12 +47,12 @@ kpathsea_xputenv(kpathsea kpse, const char *var, const char *value) int cur_loc; /* kpse_debug2(KPSE_DEBUG_VARS, "kpse_putenv($%s,%s)", var, value); */ - + old_item = NULL; cur_item = concat3(var, "=", value); /* Include '=' in length. */ var_lim = strlen(var) + 1; - + /* Have we stored something for this value already? */ for (cur_loc = 0; cur_loc != kpse->saved_count; ++cur_loc) { if (strncmp(kpse->saved_env[cur_loc], cur_item, var_lim) == 0) { @@ -106,15 +106,15 @@ kpathsea_xputenv_int (kpathsea kpse, const_string var_name, int num) { char str[MAX_INT_LENGTH]; sprintf (str, "%d", num); - + kpathsea_xputenv (kpse, var_name, str); } #if defined (KPSE_COMPAT_API) void -xputenv(const char *var, const char *value) +xputenv (const char *var, const char *value) { - kpathsea_xputenv(kpse_def, var, value); + kpathsea_xputenv (kpse_def, var, value); } void diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 250dcabc45e..55f2b75aeb5 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -16304,6 +16304,9 @@ if test "${with_kpathsea+set}" = set; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -17978,13 +17981,45 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index 07d02bef954..5b675c9feba 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,7 @@ +2010-02-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * mkind.h: #define NO_DEBUG as 1, to avoid warning. + 2009-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> * mkind.c (process_idx, check_all): Check for legitimate file diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 73c33a1f874..1c120589f4c 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -11407,6 +11407,9 @@ fi done +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12818,6 +12821,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/makeindexk/mkind.h b/Build/source/texk/makeindexk/mkind.h index 882ab38ce2d..e034da8bc85 100644 --- a/Build/source/texk/makeindexk/mkind.h +++ b/Build/source/texk/makeindexk/mkind.h @@ -84,8 +84,8 @@ #endif #if USE_KPATHSEA -#ifndef DEBUG /* strange logic: makeindex uses DEBUG to force debugging */ -#define NO_DEBUG /* kpathsea uses NO_DEBUG to suppress it. */ +#ifndef DEBUG /* strange logic: makeindex uses DEBUG to force debugging */ +#define NO_DEBUG 1 /* kpathsea uses NO_DEBUG to suppress it. */ #endif #include <kpathsea/config.h> #include <kpathsea/c-limits.h> diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure index 8d007976b5e..7ad52ef9466 100755 --- a/Build/source/texk/ps2pkm/configure +++ b/Build/source/texk/ps2pkm/configure @@ -11592,6 +11592,9 @@ done ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13003,6 +13006,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure index d2e762049bc..984ec55bdda 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -11626,6 +11626,9 @@ fi done +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13037,6 +13040,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index ad2227a275f..cf153c071cd 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -11601,6 +11601,9 @@ _ACEOF +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13012,6 +13015,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index 4ba37ff5a38..60fde1fb90f 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -11457,6 +11457,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12868,6 +12871,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup freetype (-lttf) flags @@ -12912,9 +12950,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 5ce564ba02d..b50d6db530b 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -18989,6 +18989,9 @@ _ACEOF +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -20671,6 +20674,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags @@ -21034,9 +21072,6 @@ ${top_srcdir}/../../libs/obsdcompat/*.[ch]: # Checks for xpdf (libpoppler) features. -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$XPDF_INCLUDES \$CPPFLAGS\" eval LIBS=\"$XPDF_LIBS \$LIBS\" diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure index 4bebe0a9eb3..ae5e82dd2b1 100755 --- a/Build/source/texk/xdv2pdf/configure +++ b/Build/source/texk/xdv2pdf/configure @@ -15827,6 +15827,9 @@ WARNING_OBJCFLAGS=$kpse_cv_warning_objcflags +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -17501,6 +17504,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi @@ -17920,9 +17958,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 937e15a652c..6de8b0f037c 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -15298,6 +15298,9 @@ $as_echo "$as_me: adding NeWS libraries" >&6;} X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps" fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -16709,6 +16712,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup t1lib (-lt1) flags @@ -16751,9 +16789,6 @@ ${top_builddir}/../../libs/t1lib/t1lib.h: fi -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 57e95b59058..58c20c1a870 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -12468,6 +12468,9 @@ if test "$ac_res" != no; then : fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -13887,6 +13890,41 @@ ${top_builddir}/../kpathsea/paths.h: cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if test "${kpse_cv_kpse_debug+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +FILE *f = fopen("f", "r") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes +else + kpse_cv_kpse_debug=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" +fi ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags @@ -14093,9 +14131,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" |