3 files changed, 15 insertions, 3 deletions
diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp
index f18484b6b82..8d30c021f08 100644
--- a/ACE/tests/Unload_libACE.cpp
+++ b/ACE/tests/Unload_libACE.cpp
@@ -150,10 +150,16 @@ main (int, char **)
           char buf[BUFSIZ];
 
           strcpy (buf, ace_root);
+          strcat (buf, "/lib/lib");
+#if defined (ACE_LIB_NAME)
+          strcat (buf, ACE_LIB_NAME);
+#else
+          strcat (buf, "ACE");
+#endif /* ACE_LIB_NAME */
 #if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1))
-          strcat (buf, "/lib/libACE.sl");
+          strcat (buf, ".sl");
 #else
-          strcat (buf, "/lib/libACE.so");
+          strcat (buf, ".so");
 #endif /* (__hpux) */
 
           handle = dlopen (buf, RTLD_LAZY);
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 854ea60ce0c..4b6a8b01990 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -1367,7 +1367,7 @@ project(Based Pointer Test) : acetest {
   }
 }
 
-project(Library Unload) {
+project(Library Unload): unload_libace {
   avoids += wince
   exename = UnloadLibACE
   staticflags += ACE_AS_STATIC_LIBS
diff --git a/ACE/tests/unload_libace.mpb b/ACE/tests/unload_libace.mpb
new file mode 100644
index 00000000000..7fe13bae305
--- /dev/null
+++ b/ACE/tests/unload_libace.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
+feature(ace_for_tao) {
+  macros += ACE_LIB_NAME=\\"ACE_FOR_TAO\\"
+}
+\ No newline at end of file