- Additional compilation problems on HP/UX have been repaired.

  [ISC-Bugs #17201]

diff --git a/RELNOTES b/RELNOTES
index 4c86c815c2624da4f340c6b17d0365c990847236..f66fa8cfa3b3252129a0060f661ec9efffc1d03c 100644 (file)
--- 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 50f05eff9deac89fc154fc4ce2366b7f582753d9..260be73b23803ea1790cf7dfdfb305de6523ec0b 100644 (file)
--- 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 77ddb903d432c5c2f7d51794957127fdf0e07e11..0baffa2c3eb8ac6fa754991d24f9397293b83f70 100644 (file)
--- 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],