[3270] in Release_Engineering
zhm syslogging incorrectly
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Wed Jun 29 23:43:38 1994
From: ghudson@MIT.EDU
Date: Wed, 29 Jun 94 23:43:34 -0400
To: rel-eng@MIT.EDU
zhm syslogs incorrectly on Decstations in the 7.7 release; it links
against the object file ../clients/syslogd/syslog.o, but not the
corresponding include file. Here is a patch to the Imakefile to fix
the problem.
*** /mit/zephyr/src/zhm/Imakefile Fri Apr 8 11:22:11 1994
--- Imakefile Tue Jun 21 11:23:24 1994
***************
*** 10,21 ****
#if defined(SYSLOG_COMPAT42)
SOBJS= ../clients/syslogd/syslog.o
#endif
SRCS= zhm.c zhm_server.c zhm_client.c queue.c
OBJS= zhm.o zhm_server.o zhm_client.o queue.o
! XDEFS= -DPIDFILE=\"$(ZPIDDIR)/zhm.pid\"
SimpleProgram(zhm,$(OBJS) $(SOBJS) $(ZLIB),$(ZLIBS) $(LIB_HES),$(ATHRETCDIR))
install_man(zhm.8,zhm.8)
--- 10,22 ----
#if defined(SYSLOG_COMPAT42)
SOBJS= ../clients/syslogd/syslog.o
+ SINCLUDE= -I../clients/syslogd
#endif
SRCS= zhm.c zhm_server.c zhm_client.c queue.c
OBJS= zhm.o zhm_server.o zhm_client.o queue.o
! XDEFS= $(SINCLUDE) -DPIDFILE=\"$(ZPIDDIR)/zhm.pid\"
SimpleProgram(zhm,$(OBJS) $(SOBJS) $(ZLIB),$(ZLIBS) $(LIB_HES),$(ATHRETCDIR))
install_man(zhm.8,zhm.8)
There is also the inverse problem with the zephyrd Imakefile, although
this doesn't affect clients. Here is an Imakefile patch:
*** /mit/zephyr/src/server/Imakefile Wed Nov 24 14:39:08 1993
--- Imakefile Wed Jun 29 23:42:39 1994
***************
*** 9,18 ****
/**/#
#if defined(SYSLOG_COMPAT42)
! SYSLOG_LIB= ../clients/syslogd/syslog.o
SYSLOG_DEF= -I../clients/syslogd
#else
! SYSLOG_LIB=
SYSLOG_DEF=
#endif
--- 9,18 ----
/**/#
#if defined(SYSLOG_COMPAT42)
! SYSLOG_OBJ= ../clients/syslogd/syslog.o
SYSLOG_DEF= -I../clients/syslogd
#else
! SYSLOG_OBJ=
SYSLOG_DEF=
#endif
***************
*** 54,60 ****
zstring.o
error_table(zsrv_err)
! SimpleProgram(zephyrd,$(OBJS) version.o $(ZLIB),$(ZLIBS) $(LIB_HES),$(ATHETCDIR))
install_man(zephyrd.8,zephyrd.8)
install_file(default.subscriptions,$(ZLIBDIR))
--- 54,60 ----
zstring.o
error_table(zsrv_err)
! SimpleProgram(zephyrd,$(OBJS) $(SYSLOG_OBJ) version.o $(ZLIB), $(ZLIBS) $(LIB_HES), $(ATHETCDIR))
install_man(zephyrd.8,zephyrd.8)
install_file(default.subscriptions,$(ZLIBDIR))
