From: David Hankins <dhankins@isc.org>
Date: Mon, 8 Oct 2007 14:27:53 +0000 (+0000)
Subject: - Additional compilation problems on HP/UX have been repaired.
X-Git-Tag: v4_0_0b2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2394b26b27bd256f578c8e490e9da47177fcd33f;p=thirdparty%2Fdhcp.git

- Additional compilation problems on HP/UX have been repaired.
  [ISC-Bugs #17201]
---

diff --git a/RELNOTES b/RELNOTES
index 4c86c815c..f66fa8cfa 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -90,6 +90,8 @@ suggested fixes to <dhcp-users@isc.org>.
   state is recovered from dhcpd.leases).  Arbitrary user-specified binding
   scopes ('set var = "value";') are not yet supported.
 
+- Additional compilation problems on HP/UX have been repaired.
+
 			Changes since 4.0.0a2
 
 - Fix for startup where there are no IPv4 addresses on an interface.
diff --git a/common/dlpi.c b/common/dlpi.c
index 50f05eff9..260be73b2 100644
--- a/common/dlpi.c
+++ b/common/dlpi.c
@@ -225,8 +225,8 @@ int if_register_dlpi (info)
 		info -> hw_address.hbuf [0] = HTYPE_FDDI;
 		break;
 	      default:
-              log_fatal ("%s: unsupported DLPI MAC type %ld",
-                     info -> name, dlp -> info_ack.dl_mac_type);
+		log_fatal("%s: unsupported DLPI MAC type %lu", info->name,
+			  (unsigned long)dlp->info_ack.dl_mac_type);
 		break;
 	    }
             /*
@@ -1353,8 +1353,8 @@ get_hw_addr(const char *name, struct hardware *hw) {
 			hw->hbuf[0] = HTYPE_FDDI;
 			break;
 		default:
-			log_fatal("%s: unsupported DLPI MAC type %ld",
-				  name, dlp->info_ack.dl_mac_type);
+			log_fatal("%s: unsupported DLPI MAC type %lu", name,
+				  (unsigned long)dlp->info_ack.dl_mac_type);
 	}
 
 	/*
diff --git a/configure.ac b/configure.ac
index 77ddb903d..0baffa2c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,9 @@ AC_SEARCH_LIBS(inet_aton, [socket nsl], ,
 # Check for a standalone regex library.
 AC_SEARCH_LIBS(regcomp, [regex])
 
+# For HP/UX we need -lipv6 for if_nametoindex, perhaps others.
+AC_SEARCH_LIBS(if_nametoindex, [ipv6])
+
 # check for /dev/random (declares HAVE_DEV_RANDOM)
 AC_CHECK_FILE(/dev/random,
 	AC_DEFINE([HAVE_DEV_RANDOM], [1],