소스 검색

Some minor changes for HP-UX

John C. Frickson 9 년 전
부모
커밋
49c9174ff1
4개의 변경된 파일18개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 0
      build-aux/ax_nagios_get_os
  2. 9 1
      configure
  3. 6 1
      configure.ac
  4. 1 0
      paths.in

+ 2 - 0
build-aux/ax_nagios_get_os

@@ -91,5 +91,7 @@ AC_DEFUN([AX_NAGIOS_GET_OS],
 				[msys*],		opsys="msys")
 		fi
 
+		arch=`uname -m | tr ["[A-Z]" "[a-z]"]`
+
 		AC_MSG_RESULT($opsys)
 ])

+ 9 - 1
configure

@@ -666,6 +666,7 @@ inetd_type
 init_type
 dist_ver
 dist_type
+arch
 opsys
 TARGET_PLATFORM
 TARGET_ARCH
@@ -2544,6 +2545,7 @@ LC_TIME=C
 
 
 
+
 
 
 # Find a good install program.  We prefer a C program (faster),
@@ -2709,6 +2711,8 @@ fi
 esac
 		fi
 
+		arch=`uname -m | tr "[A-Z]" "[a-z]"`
+
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $opsys" >&5
 $as_echo "$opsys" >&6; }
 
@@ -7303,7 +7307,11 @@ $as_echo_n "checking for SSL libraries... " >&6; }
 			if test "`uname -s`" = "Darwin" ; then
 				soext="dylib"
 			elif test "`uname -s`" = "HP-UX" ; then
-				soext="sl"
+				if test x$arch = "ia64"; then
+					soext="so"
+				else
+					soext="sl"
+				fi
 			elif test "`uname -s`" = "AIX" ; then
 				soext="a"
 			else

+ 6 - 1
configure.ac

@@ -50,6 +50,7 @@ AC_SUBST(TARGET_OS)
 AC_SUBST(TARGET_ARCH)
 AC_SUBST(TARGET_PLATFORM)
 AC_SUBST(opsys)
+AC_SUBST(arch)
 AC_SUBST(dist_type)
 AC_SUBST(dist_ver)
 AC_SUBST(init_type)
@@ -394,7 +395,11 @@ if test x$check_for_ssl = xyes; then
 			if test "`uname -s`" = "Darwin" ; then
 				soext="dylib"
 			elif test "`uname -s`" = "HP-UX" ; then
-				soext="sl"
+				if test x$arch = "ia64"; then
+					soext="so"
+				else
+					soext="sl"
+				fi
 			elif test "`uname -s`" = "AIX" ; then
 				soext="a"
 			else

+ 1 - 0
paths.in

@@ -8,6 +8,7 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo "Detected Environment:"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 wrout "Operating System" "@opsys@"
+wrout "Architecture" "@arch@"
 wrout "Distribution type" "@dist_type@ Version @dist_ver@"
 wrout "Init type" "@init_type@"
 wrout "Inetd type" "@inetd_type@"