HP-UX IPF Porting changes

8 files changed, 39 insertions, 2 deletions

diff --git a/ldap/admin/src/DSAdmin.pm b/ldap/admin/src/DSAdmin.pm
index 1f492b08..503134fe 100644
--- a/ldap/admin/src/DSAdmin.pm
+++ b/ldap/admin/src/DSAdmin.pm
@@ -88,7 +88,12 @@ BEGIN {
 		$dll_suffix = "_shr.a";
     }	
     elsif ( $os eq "HP-UX" ) {
+	$arch = &uname("-p");
+	if ( $arch eq "ia64" ) {
+		$dll_suffix = ".so";
+	} else {
 		$dll_suffix = ".sl";
+        }
     }	
     elsif ( $os eq "WINNT" ) {
 		$dll_suffix = ".dll";
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index c4b5a71a..fffcb2d4 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_instance.c
@@ -99,7 +99,11 @@
 #include <netinet/in.h>  /* sockaddr_in */
 #include <arpa/inet.h>   /* inet_addr */
 #ifdef HPUX
+#ifdef __ia64
+#define SHLIB_EXT "so"
+#else
 #define SHLIB_EXT "sl"
+#endif
 #else
 #define SHLIB_EXT "so"
 #endif
@@ -3092,7 +3096,11 @@ char *ds_gen_confs(char *sroot, server_config_s *cf,
     shared_lib = ".dll";
 #else
 #ifdef HPUX
+#ifdef __ia64
+    shared_lib = ".so";
+#else
     shared_lib = ".sl";
+#endif
 #else
 #ifdef AIX
 #if OSVERSION >= 4200
diff --git a/ldap/admin/src/ds_remove.c b/ldap/admin/src/ds_remove.c
index 674ac499..f5cb4fc3 100644
--- a/ldap/admin/src/ds_remove.c
+++ b/ldap/admin/src/ds_remove.c
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     char	*installroot;
     int		isRunning;
 #ifndef __LP64__  
-#ifdef hpux
+#if defined(__hpux) && !defined(__ia64)
     _main();
 #endif
 #endif
diff --git a/ldap/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index 7613ddae..5557fdbf 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.cpp
@@ -75,7 +75,11 @@ printInfo(int argc, char *argv[], char *envp[], FILE* fp)
 	fprintf(fp, "#####################################\n");
 }
 
+#if defined (__hpux) && defined (__ia64)
+int main(int argc, char *argv[], char *envp[])
+#else
 int main(int argc, char *argv[], char * /*envp*/ [])
+#endif
 {
     char *rm = getenv("REQUEST_METHOD");
     int status = 0;
diff --git a/ldap/admin/src/migrateTo4 b/ldap/admin/src/migrateTo4
index f6969ea1..dcf63eb5 100644
--- a/ldap/admin/src/migrateTo4
+++ b/ldap/admin/src/migrateTo4
@@ -83,7 +83,12 @@ BEGIN {
 		$dll_suffix = "_shr.a";
     }	
     elsif ( $os eq "HP-UX" ) {
+	$arch = &uname("-p");
+	if ( $arch eq "ia64" ) {
+		$dll_suffix = ".so";
+	} else {
 		$dll_suffix = ".sl";
+	}
     }	
     elsif ( $os eq "WINNT" ) {
 		$dll_suffix = ".dll";
diff --git a/ldap/admin/src/scripts/template-migrate50to51 b/ldap/admin/src/scripts/template-migrate50to51
index 2160024d..0feb4aca 100644
--- a/ldap/admin/src/scripts/template-migrate50to51
+++ b/ldap/admin/src/scripts/template-migrate50to51
@@ -117,7 +117,12 @@ BEGIN {
 		$dll_suffix = "_shr.a";
     }	
     elsif ( $os eq "HP-UX" ) {
+	$arch = &uname("-p");
+	if ( $arch eq "ia64" ) {
+		$dll_suffix = ".so";
+	} else {
 		$dll_suffix = ".sl";
+	}
     }	
     elsif ( $os eq "WINNT" ) {
 		$dll_suffix = ".dll";
diff --git a/ldap/admin/src/scripts/template-migrateTo5 b/ldap/admin/src/scripts/template-migrateTo5
index fd4db316..f7bcd5aa 100755
--- a/ldap/admin/src/scripts/template-migrateTo5
+++ b/ldap/admin/src/scripts/template-migrateTo5
@@ -136,7 +136,12 @@ BEGIN {
 		$dll_suffix = "_shr.a";
     }	
     elsif ( $os eq "HP-UX" ) {
+	$arch = &uname("-p");
+	if ( $arch eq "ia64" ) {
+		$dll_suffix = ".so";
+	} else {
 		$dll_suffix = ".sl";
+	}
     }	
     elsif ( $os eq "WINNT" ) {
 		$dll_suffix = ".dll";
diff --git a/ldap/admin/src/upgradeServer b/ldap/admin/src/upgradeServer
index 2c6008d3..1aeeedf5 100755
--- a/ldap/admin/src/upgradeServer
+++ b/ldap/admin/src/upgradeServer
@@ -65,7 +65,12 @@ SWITCH: {
   }
   if ($os eq "HP-UX") {
   $LIB_PATH = "SHLIB_PATH" ;
-  $shlibsuf = ".sl";
+  my $arch = &uname("-p");
+  if ($arch eq "ia64") {
+    $shlibsuf = ".so";
+  } else {
+    $shlibsuf = ".sl";
+  }
   last SWITCH ;
   }
   if ($isNT) {