[521] in Zephyr_Bugs
Re: Help with compiling w/ X11R5/ SunOS4.1.3
daemon@ATHENA.MIT.EDU (Aaron Sherman)
Thu Feb 10 13:17:44 1994
Date: Thu, 10 Feb 94 10:13:11 EST
From: asherman@new_lx.fmrco.com (Aaron Sherman)
To: uunet!MIT.EDU!warlord@uunet.UU.NET
Cc: zephyr-bugs@MIT.EDU, tm@lexington.fmrco.com, bb@rome.fmrco.com
In-Reply-To: <9402100132.AA17377@toxicwaste.media.mit.edu> (uunet!MIT.EDU!warlord)
Reply-To: asherman@fmrco.com
> Date: Wed, 09 Feb 94 20:32:03 EST
> From: Derek Atkins <uunet!MIT.EDU!warlord>
Which program fails in your attempt to build zephyr?
Finally (after much silliness) this is what I had to change, including
the regular config changes to get it to install where I wanted it.
Notably, I had to change "#define X11" in config.Imakefile to
"#define HAVE_X11", AND change it everywhere else. This was needed so
that I could add a -I option to CC that included X11 as part of the
path. Also, I had to ifdef out "#include<krb.h>" in syslogd.c. I also
needed to change other things in the config.Imakefile and zbrowser.c
(it wanted Xt functions that are now in Xaw).
Of course, I don't think it would have compiled if I had not made
/usr/local/X11R5/include/X11/Xaw/X11 a link to "."
Ordering of linking was also hosed.
-AJS
diff -r -u src/clients/syslogd/syslogd.c src-sun4/clients/syslogd/syslogd.c
--- src/clients/syslogd/syslogd.c Thu Apr 13 10:11:19 1989
+++ src-sun4/clients/syslogd/syslogd.c Thu Feb 10 10:03:55 1994
@@ -80,7 +80,9 @@
#include <netdb.h>
#include <zephyr/zephyr.h>
+#ifdef KERBEROS
#include <krb.h>
+#endif /* KERBEROS */
#define CTTY "/dev/console"
char *LogName = "/dev/log";
Only in src-sun4/clients/zaway: src
Only in src-sun4/clients/zaway: zaway.o
diff -r -u src/config/config.Imakefile src-sun4/config/config.Imakefile
--- src/config/config.Imakefile Fri Oct 27 13:29:29 1989
+++ src-sun4/config/config.Imakefile Thu Feb 10 09:53:39 1994
@@ -15,7 +15,7 @@
/* XXX BEGIN LIKELY SITE-SPECIFIC CONFIGURATION XXX */
/* This should be set to the root of your Zephyr source tree */
-SRCTOP=/afs/athena.mit.edu/astaff/project/zephyr/src
+SRCTOP=/usr/local/src/athena/zephyr/src
/* IMAKE names the command to be used to build Makefiles from
Imakefiles. If you have Imake installed somewhere else,
@@ -27,18 +27,18 @@
/* For Ultrix version 2, put -DULTRIX22 on this line */
/* If your C Library doesn't have strcasecmp() and strncasecmp()
(case-insensitive string comparisons), put -DSTRCASE on this line */
-GLOBALCDEFS=/* -DULTRIX22 */ /* -DSTRCASE */
+GLOBALCDEFS=/* -DULTRIX22 */ -DSTRCASE
/* OPTION SELECTION: */
/*
* Define KERBEROS here if you are using Zephyr with Kerberos
*/
-#define KERBEROS
+/*#define KERBEROS*/
/*
* Define HESIOD here if you are using Zephyr with Hesiod
*/
-#define HESIOD
+/*#define HESIOD*/
/*
* Define OLD_ATHENA_COMPAT if you are installing compatibility shell
* scripts
@@ -58,7 +58,7 @@
* Define PROFILED_LIBS if you want to build a profiled version of the
* Zephyr Library
*/
-#define PROFILED_LIBS
+/*#define PROFILED_LIBS*/
/*
* Define PROF_FLAG to be the flag passed to your C compiler to turn
* on profiling. On BSD systems, -pg is probably superior to -p.
@@ -77,7 +77,7 @@
* search path. WARNING: not selecting this assumes you have the new
* versions of the libss & libcom_err support on your system!]
*/
-/* #define LOCAL_LIBS */
+#define LOCAL_LIBS
/*
* Define LOCAL_makedepend if makedepend needs to be built before being
* used (e.g. if makedepend is not already installed on your system)
@@ -88,7 +88,7 @@
/*
* Define X11 if you have X Version 11 installed.
*/
-#define X11
+#define HAVE_X11
/*
* Define X11R3 if you have X11R3 (or later releases) installed. If you
* don't, you need a bug fix to XTextExtents, supplied with these sources.
@@ -112,19 +112,19 @@
* These are the directories into which various programs and files are
* installed.
*/
-CLIENTDIR= /usr/athena
-ETCATHDIR= /etc/athena
-USRETCDIR= /usr/etc
-LIBDIR= /usr/athena/lib
-LINTLIBDIR= /usr/lib/lint
-MANDIR=/usr/man
-ACLDIR=/usr/athena/lib/zephyr
+CLIENTDIR= /usr/local/athena/bin
+ETCATHDIR= /usr/local/athena/etc
+USRETCDIR= /usr/local/athena/etc
+LIBDIR= /usr/local/athena/lib
+LINTLIBDIR= /usr/local/athena/lib/lint
+MANDIR=/usr/local/athena/man
+ACLDIR=/usr/local/athena/lib/zephyr
/*
* If you do not have lint, or do not wish to make lint libraries for
* the Zephyr library, define NO_LINT.
*/
-/* #define NO_LINT */
+#define NO_LINT
/*
* If you are using lint,
@@ -135,19 +135,19 @@
/* XXX END LIKELY SITE-SPECIFIC CONFIGURATION XXX */
-#ifdef X11
-X_CDEFS= -DX11
+#ifdef HAVE_X11
+X_CDEFS= -DX11 -I/usr/local/X11R5/include -I/usr/local/X11R5/include/X11 -I/usr/local/X11R5/include/X11/Xaw
/* Loader flags to find various X11 libraries */
-X11_LIB=-lX11
-XAW_LIB=-lXaw
-XT_LIB=-lXt
-XMU_LIB=-lXmu
+X11_LIB= -L/usr/local/X11R5/lib -lX11
+XAW_LIB=-lXaw -lXext
+XT_LIB=-lXmu -lXt
+XMU_LIB=
/* Lint flags to find various X11 lint libraries */
X11_LINTLIB=-lX11
XAW_LINTLIB=-lXaw
XT_LINTLIB=-lXt
XMU_LINTLIB=-lXmu
-#else /* !X11 */
+#else /* !HAVE_X11 */
X_CDEFS=
X11_LIB=
XAW_LIB=
@@ -157,7 +157,7 @@
XAW_LINTLIB=
XT_LINTLIB=
XMU_LINTLIB=
-#endif /* X11 */
+#endif /* HAVE_X11 */
#ifdef X11R3
X3_CDEFS=-DX11R3
@@ -259,13 +259,13 @@
/* install a program which should run as root */
INSTALLSUID= install -c -m 4555 -o root
-LD=ld /* The name of the target's linker */
+LD=$(CC) /* The name of the target's linker */
-AS=as /* The name of the target's assembler */
+AS=$(CC) /* The name of the target's assembler */
LINT=lint /* The name of `lint' */
-CC=cc /* The name of the C compiler for the target */
+CC=gcc /* The name of the C compiler for the target */
HCC=$(CC) /* The name of the C compiler on _this_
* machine
@@ -273,7 +273,7 @@
CPP=$(CC) -E /* A command which invokes the C preprocessor */
-DBG=-O /* Debug or optimize? */
+DBG=-O -pipe /* Debug or optimize? */
HCFLAGS=$(CFLAGS)
Only in src-sun4/imake: ccflags
Only in src-sun4/imake: imake
diff -r -u src/include/zephyr/zephyr_conf.h src-sun4/include/zephyr/zephyr_conf.h
--- src/include/zephyr/zephyr_conf.h Thu Mar 23 09:47:49 1989
+++ src-sun4/include/zephyr/zephyr_conf.h Tue Feb 8 16:50:54 1994
@@ -21,16 +21,18 @@
/* If you are not using Kerberos, comment out the following three lines.
These provide default definitions so that users compiling Zephyr
programs don't need to put -DKERBEROS on their compile lines. */
+/*
#ifndef KERBEROS
#define KERBEROS
#endif
+*/
#define SERVER_SERVICE "zephyr"
#define SERVER_INSTANCE "zephyr"
-#define SERVER_SRVTAB "/usr/athena/lib/zephyr/srvtab"
+#define SERVER_SRVTAB "/usr/local/athena/lib/zephyr/srvtab"
/* General filenames */
-#define DEFAULT_VARS_FILE "/etc/athena/zephyr.vars"
+#define DEFAULT_VARS_FILE "/usr/local/athena/etc/zephyr.vars"
/* Service names */
#define HM_SVCNAME "zephyr-hm"
@@ -63,7 +65,7 @@
#define REALM_SZ MAXHOSTNAMELEN
#define INST_SZ 0 /* no instances w/o Kerberos */
#define ANAME_SZ 9 /* size of a username + null */
-#define KRB_REALM "ATHENA.MIT.EDU" /* your local "realm" */
+#define KRB_REALM "FCPG.Fidelity.COM" /* your local "realm" */
#endif /* !KERBEROS */
#endif /* __ZEPHYR_CONF_H__ */
Only in src-sun4/server: libdir
Only in src-sun4/server: src
diff -r -u src/server/zsrv_conf.h src-sun4/server/zsrv_conf.h
--- src/server/zsrv_conf.h Tue Jul 19 10:27:10 1988
+++ src-sun4/server/zsrv_conf.h Wed Feb 9 10:32:29 1994
@@ -18,20 +18,20 @@
/* Magic path names */
#ifndef HESIOD
-#define SERVER_LIST_FILE "/usr/athena/lib/zephyr/server.list"
+#define SERVER_LIST_FILE "/usr/local/athena/lib/zephyr/server.list"
#endif /* !HESIOD */
/* ACL's for pre-registered classes */
/* Directory containing acls and other info */
-#define ZEPHYR_ACL_DIR "/usr/athena/lib/zephyr/"
+#define ZEPHYR_ACL_DIR "/usr/local/athena/lib/zephyr/"
/* name of the class registry */
#define ZEPHYR_CLASS_REGISTRY "class-registry.acl"
/* name of file to hold the tickets for keys to exchange with other servers */
-#define ZEPHYR_TKFILE "/usr/athena/lib/zephyr/ztkts"
+#define ZEPHYR_TKFILE "/usr/local/athena/lib/zephyr/ztkts"
/* default subscription file */
-#define DEFAULT_SUBS_FILE "/usr/athena/lib/zephyr/default.subscriptions"
+#define DEFAULT_SUBS_FILE "/usr/local/athena/lib/zephyr/default.subscriptions"
/* client defines */
#define REXMIT_SECS ((long) 20) /* rexmit delay on normal notices */
Only in src-sun4/server: zsrv_conf.h~
diff -r -u src/zwgc/file_defs.h src-sun4/zwgc/file_defs.h
--- src/zwgc/file_defs.h Mon Nov 14 14:12:56 1988
+++ src-sun4/zwgc/file_defs.h Wed Feb 9 10:30:11 1994
@@ -19,11 +19,11 @@
#define USRDESC ".zephyr.desc"
#ifndef DEFDESC
-#define DEFDESC "/etc/athena/zephyr.desc"
+#define DEFDESC "/usr/local/athena/etc/zephyr.desc"
#endif
#ifndef ZCTLPROG
-#define ZCTLPROG "/usr/athena/zctl"
+#define ZCTLPROG "/usr/local/athena/bin/zctl"
#endif
extern char panic_desc[];
Only in src-sun4/zwgc: file_defs.h~
diff -r -u src/zwgc/zbrowser/Viewport.c src-sun4/zwgc/zbrowser/Viewport.c
--- src/zwgc/zbrowser/Viewport.c Thu Apr 20 16:48:02 1989
+++ src-sun4/zwgc/zbrowser/Viewport.c Wed Feb 9 12:52:45 1994
@@ -29,11 +29,11 @@
#include <X11/IntrinsicP.h>
#ifdef X11R3
-#include <X11/XawMisc.h>
+#include <X11/Xmu/Misc.h>
#else
#include <X11/Misc.h>
#endif
-#include <X11/Scroll.h>
+#include <X11/Xaw/Scrollbar.h>
#include <X11/StringDefs.h>
#include <X11/ViewportP.h>
@@ -363,7 +363,7 @@
Position top;
Dimension length, total;
{
- XtScrollBarSetThumb(w, (float) top / total, (float) length / total );
+ XawScrollbarSetThumb(w, (float) top / total, (float) length / total );
}
static void RedrawThumbs(w)
Only in src-sun4/zwgc/zbrowser: Viewport.c~
diff -r -u src/zwgc/zephyr.vars src-sun4/zwgc/zephyr.vars
--- src/zwgc/zephyr.vars Tue Aug 2 09:56:58 1988
+++ src-sun4/zwgc/zephyr.vars Wed Feb 9 10:38:27 1994
@@ -20,4 +20,4 @@
# Initialization programs.
-initprogs = /etc/athena/zinit
+initprogs = /usr/local/athena/etc/zinit
Only in src-sun4/zwgc: zephyr.vars~
Aaron Sherman I-Kinetics, Inc.
Systems Engineer "Open Systems Stepstones"
Voice: (617)661-8181 (x230) 19 Bishop Allen Dr.
Fax: (617)661-8625 Cambridge, MA 02139
Pager: (508)545-0584 asherman@i-kinetics.com
