From: Jason Stephenson <jason@sigio.com>
Date: Tue, 12 Sep 2017 15:29:41 +0000 (-0400)
Subject: LP#1708048: Fix ld problems by renaming libraries.
X-Git-Tag: osrf_rel_3_0_0-alpha~5
X-Git-Url: http://git.equinoxoli.org/?p=opensrf-equinox.git;a=commitdiff_plain;h=cace46d9acd653234ffc298d8ea483ce3c08c54d

LP#1708048: Fix ld problems by renaming libraries.

We add the lib... prefix to all C library names as expected by most
linkers.  This necessitates changes to the opensrf.xml configuration
file.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/examples/opensrf.xml.example b/examples/opensrf.xml.example
index e637b10..7e1dccb 100644
--- a/examples/opensrf.xml.example
+++ b/examples/opensrf.xml.example
@@ -135,7 +135,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>osrf_math.so</implementation>
+        <implementation>libosrf_math.so</implementation>
         <unix_config>
           <unix_sock>opensrf.math_unix.sock</unix_sock>
           <unix_pid>opensrf.math_unix.pid</unix_pid>
@@ -152,7 +152,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>osrf_dbmath.so</implementation>
+        <implementation>libosrf_dbmath.so</implementation>
         <unix_config>
           <max_requests>1000</max_requests>
           <unix_log>opensrf.dbmath_unix.log</unix_log>
diff --git a/src/c-apps/Makefile.am b/src/c-apps/Makefile.am
index 3a5b78f..54c3cac 100644
--- a/src/c-apps/Makefile.am
+++ b/src/c-apps/Makefile.am
@@ -18,19 +18,19 @@ AM_LDFLAGS = $(DEF_LDFLAGS) -L@top_builddir@/src/libopensrf
 DISTCLEANFILES = Makefile.in Makefile
 
 noinst_PROGRAMS = timejson
-lib_LTLIBRARIES = osrf_dbmath.la osrf_math.la osrf_version.la
+lib_LTLIBRARIES = libosrf_dbmath.la libosrf_math.la libosrf_version.la
 
 timejson_SOURCES = timejson.c
 timejson_LDADD = @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_dbmath_la_SOURCES = osrf_dbmath.c 
-osrf_dbmath_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_dbmath_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_dbmath_la_SOURCES = osrf_dbmath.c 
+libosrf_dbmath_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_dbmath_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_math_la_SOURCES = osrf_math.c
-osrf_math_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_math_la_LIBADD =  @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_math_la_SOURCES = osrf_math.c
+libosrf_math_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_math_la_LIBADD =  @top_builddir@/src/libopensrf/libopensrf.la
 
-osrf_version_la_SOURCES = osrf_version.c 
-osrf_version_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
-osrf_version_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la
+libosrf_version_la_SOURCES = osrf_version.c 
+libosrf_version_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:2
+libosrf_version_la_LIBADD = @top_builddir@/src/libopensrf/libopensrf.la