Patch to build the library on FreeBSD using shared library naming convention +...

Patch to build the library on FreeBSD using shared library naming convention + minor changes, by Max Gotlib


git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@173626 13f79535-47bb-0310-9956-ffa450edef68

src/xercesc/Makefile.incl

@@ -305,6 +305,8 @@ else
     ALLLIBS = ${LIBS}
 endif
 SHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname,${SO_NAME}
 endif
 
 #=============== IRIX SPECIFIC OPTIONS ============================

tests/IDom/ITraversal/Makefile.in

@@ -75,7 +75,7 @@ CFLAGS = @cflags@
 LDFLAGS = @ldflags@
 PREFIX = @prefix@
 THREADS = @threads@
-LIBS = @extra_libs@
+EXTRA_LIBS = @extra_libs@
 
 include ../../../version.incl
 include ../../Makefile.incl

tests/Makefile.in

@@ -87,7 +87,10 @@ ifeq (${PLATFORM},HPUX)
       all::	bindir domidtest dommemtest idommemtest domtest idomtest threadtest encodingtest traversal itraversal rangetest irangetest inittermtest
   endif
 else
-    all::	bindir domidtest dommemtest idommemtest domtest idomtest threadtest encodingtest traversal itraversal rangetest irangetest inittermtest
+    all::	bindir domidtest dommemtest idommemtest domtest idomtest encodingtest traversal itraversal rangetest irangetest inittermtest
+  ifneq (${THREADS},none)
+    all::	threadtest
+  endif
 endif
 
 bindir::

tests/runConfigure

@@ -339,21 +339,22 @@ if test $platform = "freebsd"; then
     if test -n "${XERCESCROOT}"; then
        # try lookup the configuration results
        . "${XERCESCROOT}/version.incl"
-       if test -f "${XERCESCROOT}/src/config.log" ; then
-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/config.log" \
+       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
               > /dev/null 2>&1 ; then
                transcodingLibs=" -L/usr/local/lib -liconv "
                transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
            fi
-       elif test -f "${XERCESCROOT}/obj/IconvFBSDTransService.o" ; then
-           if nm "${XERCESCROOT}/obj/IconvFBSDTransService.o" | \
-              grep XML_USE_LIBICONV > /dev/null 2>&1 ; then
+       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+              grep iconv_open > /dev/null 2>&1 ; then
                transcodingLibs=" -L/usr/local/lib -liconv "
                transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
            fi
-       elif test -f "${XERCESCROOT}/lib/libxerces-c${VER}.so" ; then
-           if nm "${XERCESCROOT}/lib/libxerces-c${VER}.so" | \
-              grep XML_USE_LIBICONV > /dev/null 2>&1 ; then
+       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+              grep iconv_open > /dev/null 2>&1 ; then
                transcodingLibs=" -L/usr/local/lib -liconv "
                transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
            fi