summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-04 08:50:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-04 08:50:20 +0000
commit2300ccb10e93ce75ca3e3dcf2b26bd4600761a47 (patch)
tree37a33bbefeac5a45bf01648b1e27c91c000902c9 /Build/source/utils
parentd99cbbf7e8cc585a93ea5db4531c0da771c1f0ee (diff)
misc cleanup
git-svn-id: svn://tug.org/texlive/trunk@18715 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog5
-rw-r--r--Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const26
-rw-r--r--Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h4
-rw-r--r--Build/source/utils/chktex/chktex-1.6.4/FindErrs.c2
-rw-r--r--Build/source/utils/chktex/chktex-1.6.4/FindErrs.h2
-rwxr-xr-xBuild/source/utils/configure10
6 files changed, 17 insertions, 32 deletions
diff --git a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog
index 1e921b92a5c..8f9a0ae66fb 100644
--- a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog
+++ b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-const: Change OutputFormat and PipeOutputFormat back
+ to non-const.
+
2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-04-strcpy-bug (new): Bug fixes:
diff --git a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const
index 208d6bf115c..182d0b4241c 100644
--- a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const
+++ b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const
@@ -39,13 +39,11 @@ diff -ur chktex-1.6.4.orig/ChkTeX.h chktex-1.6.4/ChkTeX.h
DEF(int, HeadErrOut, TRUE) \
- DEF(char *, OutputName, "") \
- DEF(char *, PseudoInName, NULL) \
-- DEF(char *, OutputFormat, VerbNormal) \
-- DEF(char *, PipeOutputFormat, NULL) \
-- DEF(char *, Delimit, ":") \
+ DEF(const char *, OutputName, "") \
+ DEF(const char *, PseudoInName, NULL) \
-+ DEF(const char *, OutputFormat, VerbNormal) \
-+ DEF(const char *, PipeOutputFormat, NULL) \
+ DEF(char *, OutputFormat, VerbNormal) \
+ DEF(char *, PipeOutputFormat, NULL) \
+- DEF(char *, Delimit, ":") \
+ DEF(const char *, Delimit, ":") \
DEF(long, DebugLevel, 0)
@@ -107,15 +105,6 @@ diff -ur chktex-1.6.4.orig/FindErrs.c chktex-1.6.4/FindErrs.c
{
switch (Cnt)
{
-@@ -1329,7 +1330,7 @@
- char PrintBuffer[BUFSIZ];
- va_list MsgArgs;
-
-- char *LastNorm = OutputFormat;
-+ const char *LastNorm = OutputFormat;
- char *of;
- int c;
-
@@ -1468,7 +1469,7 @@
static enum ErrNum PerformCommand(const char *Cmd, char *Arg)
@@ -137,15 +126,6 @@ diff -ur chktex-1.6.4.orig/FindErrs.h chktex-1.6.4/FindErrs.h
};
enum ItState
-@@ -183,7 +183,7 @@
-
- extern struct ErrMsg LaTeXMsgs[emMaxFault + 1];
-
--extern char *OutputFormat;
-+extern const char *OutputFormat;
-
- int FindErr(const char *, const unsigned long);
- void PrintError(const char *, const char *, const long, const long,
diff -ur chktex-1.6.4.orig/OpSys.c chktex-1.6.4/OpSys.c
--- chktex-1.6.4.orig/OpSys.c 2007-10-20 09:10:48.000000000 +0200
+++ chktex-1.6.4/OpSys.c 2010-05-02 22:18:12.805229781 +0200
diff --git a/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h b/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h
index 8e59ec4f0bf..5d25a0d6728 100644
--- a/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h
+++ b/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h
@@ -279,8 +279,8 @@ DEBUGBITS(Debug_BIT)
DEF(int, HeadErrOut, TRUE) \
DEF(const char *, OutputName, "") \
DEF(const char *, PseudoInName, NULL) \
- DEF(const char *, OutputFormat, VerbNormal) \
- DEF(const char *, PipeOutputFormat, NULL) \
+ DEF(char *, OutputFormat, VerbNormal) \
+ DEF(char *, PipeOutputFormat, NULL) \
DEF(const char *, Delimit, ":") \
DEF(long, DebugLevel, 0)
diff --git a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c
index 933bd4567e3..cb5269eb4f3 100644
--- a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c
+++ b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c
@@ -1331,7 +1331,7 @@ PrintError(const char *File, const char *String,
char PrintBuffer[BUFSIZ];
va_list MsgArgs;
- const char *LastNorm = OutputFormat;
+ char *LastNorm = OutputFormat;
char *of;
int c;
diff --git a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h
index b3e651bef45..f3580600ba9 100644
--- a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h
+++ b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h
@@ -183,7 +183,7 @@ enum DotLevel
extern struct ErrMsg LaTeXMsgs[emMaxFault + 1];
-extern const char *OutputFormat;
+extern char *OutputFormat;
int FindErr(const char *, const unsigned long);
void PrintError(const char *, const char *, const long, const long,
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 9af3f902ea6..3ed9a8c09cb 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -677,7 +677,7 @@ with_xindy_recode
enable_xindy_old
enable_xpdfopen
enable_web2c
-with_tex_banner
+with_banner_add
with_editor
enable_auto_core
enable_dump_share
@@ -1553,7 +1553,7 @@ Optional Packages:
[default: no]
--with-xindy-recode For `xindy': use `recode' instead of `iconv'
(default is NO)
- --with-tex-banner=STR version string appended to banner lines [Web2C YEAR]
+ --with-banner-add=STR add STR to version string appended to banner lines
--with-editor=CMD invoke CMD from the `e' option [vi +%d %s]
--without-mf-x-toolkit do not use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
@@ -3448,9 +3448,9 @@ test "x$enable_web2c" = xno || {
## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options for TeX and MF
-# Check whether --with-tex-banner was given.
-if test "${with_tex_banner+set}" = set; then :
- withval=$with_tex_banner;
+# Check whether --with-banner-add was given.
+if test "${with_banner_add+set}" = set; then :
+ withval=$with_banner_add;
fi
# Check whether --with-editor was given.