Skip to content
Browse files

26313: --enable-custom-patchlevel

unposted: WARN_CREATE_GLOBAL in tcp_log
  • Loading branch information...
1 parent 3af9307 commit 45bee14fec248d79a345ef970ad4933540d50dac Peter Stephenson committed Jan 15, 2009
Showing with 34 additions and 3 deletions.
  1. +7 −1 ChangeLog
  2. +2 −2 Functions/TCP/tcp_log
  3. +13 −0 INSTALL
  4. +4 −0 Src/params.c
  5. +8 −0 configure.ac
View
8 ChangeLog
@@ -1,5 +1,11 @@
2009-01-15 Peter Stephenson <pws@csr.com>
+ * 26313: INSTALL, configure.ac, Src/params.c: add
+ --enable-custom-patchlevel for tweaked shells.
+
+ * Functions/TCP/tcp_log: unposted: suppress WARN_CREATE_GLOBAL
+ message.
+
* 26312: Phil Pennock: Doc/Zsh/cond.yo, Doc/Zsh/mod_pcre.yo,
Doc/Zsh/mod_regex.yo: Document no variables altered on failed
match.
@@ -10913,5 +10919,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4509 $
+* $Revision: 1.4510 $
*****************************************************
View
4 Functions/TCP/tcp_log
@@ -76,7 +76,7 @@ if (( $# != 1 )); then
fi
if [[ -n $sess ]]; then
- TCP_LOG_SESS=$1
+ typeset -g TCP_LOG_SESS=$1
if [[ -z $append ]]; then
local sesslogs
integer i
@@ -87,7 +87,7 @@ if [[ -n $sess ]]; then
done
fi
else
- TCP_LOG=$1
+ typeset -g TCP_LOG=$1
[[ -z $append ]] && : >$TCP_LOG
fi
View
13 INSTALL
@@ -271,6 +271,19 @@ may wish not to install the zsh/newuser module.
CONFIGURATION OPTIONS
=====================
+Modified versions of zsh
+------------------------
+
+If you are making local modifications to zsh, you are strongly
+advised to configure with the option
+
+ --enable-local-patchlevel="<my-mod-string>"
+
+so that the variable $ZSH_PATCHLEVEL indicates this is not a standard
+version of the shell. The argument is arbitrary, but should indicate
+the entity that is customizing the shell, for example the OS vendor
+or distributor.
+
Multibyte Character Support
---------------------------
View
4 Src/params.c
@@ -31,7 +31,11 @@
#include "params.pro"
#include "version.h"
+#ifdef CUSTOM_PATCHLEVEL
+#define ZSH_PATCHLEVEL CUSTOM_PATCHLEVEL
+#else
#include "patchlevel.h"
+#endif
/* what level of localness we are at */
View
8 configure.ac
@@ -304,6 +304,14 @@ fi], [sitescriptdir=${datadir}/${tzsh_name}/scripts])
AC_SUBST(scriptdir)dnl
AC_SUBST(sitescriptdir)dnl
+AH_TEMPLATE([CUSTOM_PATCHLEVEL],
+[Define to a custom value for the ZSH_PATCHLEVEL parameter])
+AC_ARG_ENABLE(custom-patchlevel,
+AC_HELP_STRING([--enable-custom-patchlevel], [set a custom ZSH_PATCHLEVEL value]),
+[if test x$enableval != x && test x$enableval != xno; then
+ AC_DEFINE_UNQUOTED([CUSTOM_PATCHLEVEL], ["$enableval"])
+fi])
+
dnl Do you want maildir support?
ifdef([maildir_support],[undefine([maildir_support])])dnl
AH_TEMPLATE([MAILDIR_SUPPORT],

0 comments on commit 45bee14

Please sign in to comment.
Something went wrong with that request. Please try again.