summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar samisa2011-08-29 11:22:25 +0000
committerGravatar samisa2011-08-29 11:22:25 +0000
commit14ac381647e2d8ef5d28ebe2c23c2ffb2693e009 (patch)
treec499a826a06f655a33f6b11eb1bf884fae2993f1
parentb67b6ef1431b9f7593c32caca387d2955d31fa84 (diff)
downloadaxis2c-14ac381647e2d8ef5d28ebe2c23c2ffb2693e009.tar.gz
axis2c-14ac381647e2d8ef5d28ebe2c23c2ffb2693e009.tar.bz2
Applied the patch given to AXIS2C-1549 that Allow shared libs to be loaded using literal filenames as well as original inferred style
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1162744 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--util/src/dll_desc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/util/src/dll_desc.c b/util/src/dll_desc.c
index 697caf3..4b65945 100644
--- a/util/src/dll_desc.c
+++ b/util/src/dll_desc.c
@@ -291,6 +291,14 @@ axutil_dll_desc_create_platform_specific_dll_name(
AXIS2_ENV_CHECK(env, NULL);
+ /* allow config to give a literal lib name since it may want a
+ * versioned lib like "libfoo.so.0" */
+ if (axutil_strstr(class_name, AXIS2_LIB_SUFFIX)) {
+ /* assume the class_name is the literal lib file name */
+ dll_desc->dll_name = axutil_strdup(env,class_name);
+ return dll_desc->dll_name;
+ }
+
temp_name = axutil_stracat(env, AXIS2_LIB_PREFIX, class_name);
dll_desc->dll_name = axutil_stracat(env, temp_name, AXIS2_LIB_SUFFIX);
AXIS2_FREE(env->allocator, temp_name);