From: Ted Lemon <source@isc.org>
Date: Thu, 25 Jun 1998 18:34:47 +0000 (+0000)
Subject: Rhapsody support
X-Git-Tag: V2-BETA-1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85858f227779b25f3b88f0c2272b529c49117ac9;p=thirdparty%2Fdhcp.git

Rhapsody support
---

diff --git a/Makefile.conf b/Makefile.conf
index bb2d3c0a0..df0418086 100644
--- 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 afccab3e2..8858d31a2 100755
--- 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 deacaedde..4ea4cd863 100644
--- 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 5c0091b78..1631211a6 100644
--- 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