Check for HP-UX features on HP-UX only.

Do the existing dl_hp_ppa_info_t.dl_module_id_1 and putmsg() checks on
HP-UX only.  While at it, add the missing CMake leg for the former.

Author: infrastation

CMakeLists.txt

@@ -1003,19 +1003,26 @@ else(WIN32)
         endif(LIBXNET_HAS_RECVMSG)
     endif(NOT STDLIBS_HAVE_GETADDRINFO)
 
-    #
-    # DLPI needs putmsg under HP-UX, so test for -lstr while we're at it.
-    #
-    check_function_exists(putmsg STDLIBS_HAVE_PUTMSG)
-    if(NOT STDLIBS_HAVE_PUTMSG)
-        check_library_exists(str putmsg "" LIBSTR_HAS_PUTMSG)
-        if(LIBSTR_HAS_PUTMSG)
-            set(PCAP_LINK_LIBRARIES str ${PCAP_LINK_LIBRARIES})
-            set(LIBS "-lstr ${LIBS}")
-            set(LIBS_STATIC "-lstr ${LIBS_STATIC}")
-            set(LIBS_PRIVATE "-lstr ${LIBS_PRIVATE}")
-        endif(LIBSTR_HAS_PUTMSG)
-    endif(NOT STDLIBS_HAVE_PUTMSG)
+    if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+        #
+        # Same as the respective AC_CHECK_MEMBERS() in Autoconf.
+        #
+        check_struct_has_member("struct dl_hp_ppa_info_t" dl_module_id_1 "sys/types.h;sys/dlpi.h;sys/dlpi_ext.h" HAVE_DL_HP_PPA_INFO_T_DL_MODULE_ID_1)
+
+        #
+        # Same as the respective AC_SEARCH_LIBS() in Autoconf.
+        #
+        check_function_exists(putmsg STDLIBS_HAVE_PUTMSG)
+        if(NOT STDLIBS_HAVE_PUTMSG)
+            check_library_exists(str putmsg "" LIBSTR_HAS_PUTMSG)
+            if(LIBSTR_HAS_PUTMSG)
+                set(PCAP_LINK_LIBRARIES str ${PCAP_LINK_LIBRARIES})
+                set(LIBS "-lstr ${LIBS}")
+                set(LIBS_STATIC "-lstr ${LIBS_STATIC}")
+                set(LIBS_PRIVATE "-lstr ${LIBS_PRIVATE}")
+            endif(LIBSTR_HAS_PUTMSG)
+        endif(NOT STDLIBS_HAVE_PUTMSG)
+    endif()
 
     #
     # Haiku has getpass() in libbsd.

aclocal.m4

@@ -775,11 +775,6 @@ AC_DEFUN(AC_LBL_LIBRARY_NET, [
 	    LIBS="-lxnet $LIBS"
 	], , -lsocket -lnsl)
     ])
-
-    #
-    # DLPI needs putmsg under HP-UX, so test for -lstr while we're at it.
-    #
-    AC_SEARCH_LIBS(putmsg, str)
 ])
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])

configure.ac

@@ -151,6 +151,33 @@ haiku*)
 	#
 	LIBS="-lbsd $LIBS"
 	;;
+hpux*)
+	#
+	# Check to see if the dl_hp_ppa_info_t struct has the HP-UX 11.00
+	# dl_module_id_1 member.
+	# (This is the case on HP-UX B.11.31.)
+	#
+	# NOTE: any failure means we conclude that it doesn't have that member,
+	# so if we don't have DLPI, don't have a <sys/dlpi_ext.h> header, or
+	# have one that doesn't declare a dl_hp_ppa_info_t type, we conclude
+	# it doesn't have that member (which is OK, as either we won't be
+	# using code that would use that member, or we wouldn't compile in
+	# any case).
+	#
+	AC_CHECK_MEMBERS([dl_hp_ppa_info_t.dl_module_id_1],,,
+	    [
+		#include <sys/types.h>
+		#include <sys/dlpi.h>
+		#include <sys/dlpi_ext.h>
+	    ])
+
+	#
+	# On HP-UX DLPI needs putmsg(), which previously was in libstr, but in
+	# HP-UX B.11.31 this is no longer the case.
+	# AC_SEARCH_LIBS() accounts for that.
+	#
+	AC_SEARCH_LIBS([putmsg], [str])
+	;;
 esac
 
 AC_CHECK_FUNC(strerror_r,
@@ -2319,24 +2346,6 @@ AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,
 	#include <sys/socket.h>
     ])
 
-#
-# Check to see if the dl_hp_ppa_info_t struct has the HP-UX 11.00
-# dl_module_id_1 member.
-#
-# NOTE: any failure means we conclude that it doesn't have that member,
-# so if we don't have DLPI, don't have a <sys/dlpi_ext.h> header, or
-# have one that doesn't declare a dl_hp_ppa_info_t type, we conclude
-# it doesn't have that member (which is OK, as either we won't be
-# using code that would use that member, or we wouldn't compile in
-# any case).
-#
-AC_CHECK_MEMBERS([dl_hp_ppa_info_t.dl_module_id_1],,,
-    [
-	#include <sys/types.h>
-	#include <sys/dlpi.h>
-	#include <sys/dlpi_ext.h>
-    ])
-
 #
 # Various Linux-specific mechanisms.
 #