summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-07-14 20:03:39 +0000
committerjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-07-14 20:03:39 +0000
commit77a91ea40b9b2d33ad4d6853944fe0a55cca9cc1 (patch)
tree21ecb85e66de673f7c83dd43a63a6dff0fb96906
parent765f2cce5e63a3091dd631cc97abc017090145d1 (diff)
downloadATCD-77a91ea40b9b2d33ad4d6853944fe0a55cca9cc1.tar.gz
Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com>
* ace/config-hpux-11.00.h: * include/makeinclude/platform_hpux_aCC.GNU: Changing the shared library extension for hpux ia64 to ".so". On HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and lib*.so on IPF.
-rw-r--r--ChangeLog10
-rw-r--r--ace/config-hpux-11.00.h6
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU6
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ce5673cbcab..c306e7280f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,19 @@
+Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com>
+
+ * ace/config-hpux-11.00.h:
+ * include/makeinclude/platform_hpux_aCC.GNU:
+
+ Changing the shared library extension for hpux ia64 to ".so". On
+ HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and
+ lib*.so on IPF.
+
Fri Jul 14 19:13:06 UTC 2006 john_c <john@ociweb.com>
* ace/Timer_Queue_Adapters.cpp:
Include file was missing. Fixes compile error when
ACE_HAS_DEFERRED_TIMER_COMMANDS is defined.
+
Fri Jul 14 19:05:15 UTC 2006 Ciju John <john_c@ociweb.com>
* bin/tao_other_tests.lst:
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index e849eba93b5..44513e885e4 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -405,7 +405,11 @@
#define ACE_LACKS_SYS_SYSCTL_H
// Shared library name/path components
-#define ACE_DLL_SUFFIX ".sl"
+#if defined (__ia64)
+# define ACE_DLL_SUFFIX ".so"
+#else
+# define ACE_DLL_SUFFIX ".sl"
+#endif /* __ia64 */
#if defined (__LP64__)
# define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH"
#else
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index a61ccbde6ca..c615c28c7a8 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -171,7 +171,11 @@ endif
endif
-SOEXT = sl
+ifeq ($(itanium),1)
+ SOEXT = so
+else
+ SOEXT = sl
+endif
ifeq ($(buildbits),32)
ifeq ($(itanium),1)