summaryrefslogtreecommitdiff
path: root/Build/source/texk/makeindexk
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/makeindexk
parentb9a895c295af055dfbc9599c2a763ed0d443d109 (diff)
minor cleanup
git-svn-id: svn://tug.org/texlive/trunk@17034 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makeindexk')
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rwxr-xr-xBuild/source/texk/makeindexk/configure38
-rw-r--r--Build/source/texk/makeindexk/mkind.h4
3 files changed, 44 insertions, 2 deletions
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>