zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: 3.1.6-bart-8: bad configure test, misc.
@ 1999-11-04 16:29 Bart Schaefer
  1999-11-04 16:37 ` Zefram
  0 siblings, 1 reply; 2+ messages in thread
From: Bart Schaefer @ 1999-11-04 16:29 UTC (permalink / raw)
  To: zsh-workers

This fixes the bad getpwent() test, and changes the handling of (lack of)
yodl to (a) avoid producing errors like ":2txt: command not found" and (b)
produce (hopefully) less confusing output from "make".  Note that it uses
"exit 0" because the old way attempted (badly) to be a successful no-op
when the file to be built already exists, which is the case when you've
unpacked a zsh distribution tar.gz (but NOT when you're using CVS'd source
because zsh.texi et al. are in the .cvsignore files).

(Have I (parenthetically) explained that well enough?)

Also included are .distfiles changes for the recent new and moved files.

Index: configure.in
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/configure.in,v
retrieving revision 1.48
diff -u -r1.48 configure.in
--- configure.in	1999/11/03 09:49:23	1.48
+++ configure.in	1999/11/04 03:50:33
@@ -398,7 +398,7 @@
 AC_PROG_INSTALL             dnl Check for BSD compatible `install'
 AC_PROG_AWK                 dnl Check for mawk,gawk,nawk, then awk.
 AC_PROG_LN                  dnl Check for working ln, for "make install"
-AC_CHECK_PROGS([YODL], [yodl], [:])
+AC_CHECK_PROGS([YODL], [yodl], [exit 0; yodl])
 
 dnl ------------------
 dnl CHECK HEADER FILES
@@ -1273,12 +1273,13 @@
 #include <pwd.h>
 main() {
     struct passwd *pw1, *pw2;
-    char buf[1024];
+    char buf[1024], name[1024];
     sprintf(buf, "%d:%d", getpid(), rand());
     pw1=getpwnam(buf);
+    if (pw1) strcpy(name, pw1->pw_name);
     sprintf(buf, "%d:%d", rand(), getpid());
     pw2=getpwnam(buf);
-    exit(pw1!=0 && pw2!=0 && !strcmp(pw1->pw_name, pw2->pw_name));
+    exit(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name));
 }
 ],
       zsh_cv_sys_getpwnam_faked=no,
Index: Completion/Base/.distfiles
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/Completion/Base/.distfiles,v
retrieving revision 1.7
diff -u -r1.7 .distfiles
--- .distfiles	1999/11/03 09:49:23	1.7
+++ .distfiles	1999/11/04 03:52:44
@@ -1,7 +1,7 @@
 DISTFILES_SRC='
     .distfiles 
     _arg_compile _arguments _brace_parameter _combination _command_names
-    _condition _default _describe _equal _first _job _math _parameter
+    _condition _default _describe _equal _first _jobs _math _parameter
     _precommand _redirect _regex_arguments _subscript _tilde _value
     _values _vars
 '
Index: Completion/Builtins/.distfiles
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/Completion/Builtins/.distfiles,v
retrieving revision 1.4
diff -u -r1.4 .distfiles
--- .distfiles	1999/11/03 09:49:23	1.4
+++ .distfiles	1999/11/04 03:53:15
@@ -1,7 +1,7 @@
 DISTFILES_SRC='
     .distfiles
     _aliases _arrays _autoload _bg_jobs _bindkey _builtin _cd _command
-    _compdef _disable _echotc _enable _fc _functions _hash _jobs _kill
+    _compdef _disable _echotc _enable _fc _functions _hash _kill
     _limits _nothing _popd _sched _set _setopt _source _stat _trap _unhash
     _unsetopt _vars_eq _wait _which _zftp _zle _zmodload
 '
Index: Completion/Core/.distfiles
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/Completion/Core/.distfiles,v
retrieving revision 1.3
diff -u -r1.3 .distfiles
--- .distfiles	1999/09/07 17:19:31	1.3
+++ .distfiles	1999/11/04 03:53:28
@@ -1,6 +1,6 @@
 DISTFILES_SRC='
     .distfiles
-    _approximate _compalso _complete _correct _description _display _expand
+    _approximate _compalso _complete _correct _description _expand
     _files _list _main_complete _match _menu _multi_parts
     _message _normal _oldlist _options _parameters _path_files
     _sep_parts _set_options _unset_options
Index: Completion/Debian/.distfiles
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-3.1/Completion/Debian/.distfiles,v
retrieving revision 1.1.3.2
diff -u -r1.1.3.2 .distfiles
--- .distfiles	1999/09/13 15:35:30	1.1.3.2
+++ .distfiles	1999/11/04 03:54:34
@@ -1,5 +1,4 @@
 DISTFILES_SRC='
     .distfiles
-    _apt _deb_packages
+    _apt _deb_packages _dpkg _dpkg-source
 '
-

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: PATCH: 3.1.6-bart-8: bad configure test, misc.
  1999-11-04 16:29 PATCH: 3.1.6-bart-8: bad configure test, misc Bart Schaefer
@ 1999-11-04 16:37 ` Zefram
  0 siblings, 0 replies; 2+ messages in thread
From: Zefram @ 1999-11-04 16:37 UTC (permalink / raw)
  To: Bart Schaefer; +Cc: zsh-workers

Bart Schaefer wrote:
>-AC_CHECK_PROGS([YODL], [yodl], [:])
>+AC_CHECK_PROGS([YODL], [yodl], [exit 0; yodl])

  AC_CHECK_PROGS([YODL], [yodl], [: yodl])

would be better -- it preserves the semantics if $(YODL) is used in a
compound command, which is what the original tried to do.

-zefram


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~1999-11-04 16:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1999-11-04 16:29 PATCH: 3.1.6-bart-8: bad configure test, misc Bart Schaefer
1999-11-04 16:37 ` Zefram

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).