Small changes to make things work on Solaris 11

configure

@@ -7258,10 +7258,6 @@ fi
 		fi
 	fi
 
-				if test "`uname -s`" = "HP-UX" ; then
-		LDFLAGS="$LDFLAGS -Wl,+allowdups";
-	fi
-
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos include files" >&5
 $as_echo_n "checking for Kerberos include files... " >&6; }
 	found_kerberos=no
@@ -7353,6 +7349,10 @@ fi
 
 NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
 
+				if test "`uname -s`" = "HP-UX" ; then
+		LDFLAGS="$LDFLAGS -Wl,+allowdups";
+	fi
+
 # Determine target OS, version and architecture for package build macros
 if test "x$target_ver" = "x" ; then
 	TARGET_VER=`uname -r`

configure.ac

@@ -418,13 +418,6 @@ if test x$check_for_ssl = xyes; then
 		fi
 	fi
 
-	dnl On HP-UX the compile will fail with a 'Duplicate symbol "setenv"' error
-	dnl in '/usr/local/lib/libwrap.a(setenv.o)' and '/usr/local/lib/libiberty.a(setenv.o)'
-	dnl so allow duplicate symbols, and use the first one
-	if test "`uname -s`" = "HP-UX" ; then
-		LDFLAGS="$LDFLAGS -Wl,+allowdups";
-	fi
-
 	dnl RedHat 8.0 and 9.0 include openssl compiled with kerberos, so we must include header file
 	AC_MSG_CHECKING(for Kerberos include files)
 	found_kerberos=no
@@ -485,6 +478,13 @@ AC_ARG_WITH([nagios_group],
 	[nagios_group=nagios])
 NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
 
+	dnl On HP-UX the compile will fail with a 'Duplicate symbol "setenv"' error
+	dnl in '/usr/local/lib/libwrap.a(setenv.o)' and '/usr/local/lib/libiberty.a(setenv.o)'
+	dnl so allow duplicate symbols, and use the first one
+	if test "`uname -s`" = "HP-UX" ; then
+		LDFLAGS="$LDFLAGS -Wl,+allowdups";
+	fi
+
 # Determine target OS, version and architecture for package build macros
 if test "x$target_ver" = "x" ; then
 	TARGET_VER=`uname -r`

src/check_nrpe.c

@@ -46,7 +46,7 @@ int show_version = FALSE;
 int packet_ver = NRPE_PACKET_VERSION_3;
 
 #ifdef HAVE_SSL
-# if defined(__sun) || defined(_AIX)
+# if (defined(__sun) && defined(__SunOS_5_10)) || defined(_AIX)
 SSL_METHOD *meth;
 # else
 const SSL_METHOD *meth;

src/nrpe.c

@@ -41,7 +41,7 @@ int       deny_severity = LOG_WARNING;
 #endif
 
 #ifdef HAVE_SSL
-# if defined(__sun) || defined(_AIX)
+# if (defined(__sun) && defined(__SunOS_5_10)) || defined(_AIX)
 SSL_METHOD *meth;
 # else
 const SSL_METHOD *meth;