Rhapsody support

diff --git a/Makefile.conf b/Makefile.conf
index bb2d3c0a03bd8ebd39e3849c0c91bf21a5634547..df04180863024a6e987366505522a6e74ebdddcf 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -145,6 +145,14 @@ VARDB = /var/db
 #SCRIPT=freebsd
 ##--freebsd--
 
+## Rhapsody
+##--rhapsody--
+#CF = cf/rhapsody.h
+#COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#        -Wno-uninitialized -Werror -pipe
+#SCRIPT=rhapsody
+##--rhapsody--
+
 ## NetBSD
 ##--netbsd--
 #CF = cf/netbsd.h

diff --git a/configure b/configure
index afccab3e2a78b2cae27e57bdc26947250b7c07d5..8858d31a20968d6571080e69e287797e1f1b8f51 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,6 +7,8 @@ machine=`uname -m`
 
 if [ "$sysname" = "" ]; then
   case $uname in
+    Rhapsody)
+      sysname=rhapsody;;
     ULTRIX)
       sysname=ultrix;;
     BSD/OS)

diff --git a/includes/osdep.h b/includes/osdep.h
index deacaedde12573e1ec564432327b8dc779d014b9..4ea4cd863d756b98ed3b1a5021aaa19081c2303b 100644 (file)
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -113,7 +113,11 @@
 #endif
 
 #ifdef NeXT
+# ifdef __APPLE__
+#  include "cf/rhapsody.h"
+# else
 #  include "cf/nextstep.h"
+# endif
 #endif
 
 /* Porting::

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 5c0091b789e19c0228298ed7a1b9ba10edbf0b77..1631211a6cdd8bef11d69299b33efa0ffd8413d6 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcrelay.c,v 1.9.2.2 1998/06/25 05:50:23 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.9.2.3 1998/06/25 18:34:47 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -56,6 +56,12 @@ struct tree_cache *global_options [256];
 
 int log_perror = 1;
 
+/* Needed to prevent linking against conflex.c. */
+int lexline;
+int lexchar;
+char *token_line;
+char *tlname;
+
 char *path_dhcrelay_pid = _PATH_DHCRELAY_PID;
 
 #ifdef USE_FALLBACK