A few tweaks around linking libsmbclient

diff --git a/source/Makefile.in b/source/Makefile.in
index f3e8b284d6cd82cb9aa181050452dc951418fb5a..d81729e6b8ab37837b63fd0ef1f74a63abddc872 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -9,6 +9,7 @@ mandir=@mandir@
 
 LIBS=@LIBS@
 CC=@CC@
+SHLD=@SHLD@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
@@ -591,7 +592,7 @@ bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32)
 libsmbclient: $(LIBSMBCLIENT_PICOBJS)
        -if [ $(BLDSHARED) = true ]; then \
           echo Linking libsmbclient shared library bin/$@.@SHLIBEXT@; \
-          $(LD) @LDSHFLAGS@ -o bin/$@.@SHLIBEXT@ $(LIBSMBCLIENT_PICOBJS) $(LIBS); \
+          $(SHLD) @LDSHFLAGS@ -o bin/$@.@SHLIBEXT@ $(LIBSMBCLIENT_PICOBJS) $(LIBS); \
        fi
        @echo Linking libsmbclient non-shared library bin/$@.a
        -$(AR) -rc bin/$@.a $(LIBSMBCLIENT_PICOBJS) 

diff --git a/source/configure.in b/source/configure.in
index 721cdd93c231b76f7679cb67fff5b072b04fd55c..805e8c0b06e13d409c69b0241ba883dd7b723ec8 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -9,6 +9,7 @@ AC_SUBST(SHELL)
 AC_SUBST(RUNPROG)
 AC_SUBST(MPROGS)
 AC_SUBST(LDSHFLAGS)
+AC_SUBST(SHLD)
 AC_SUBST(HOST_OS)
 AC_SUBST(PAM_MOD)
 AC_SUBST(WRAP)
@@ -606,6 +607,7 @@ AC_LIBTESTFUNC(sec, getprpwnam)
 # these are the defaults, good for lots of systems
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
+SHLD="\${CC}"
 PICFLAG=""
 SHLIBEXT="so"
 BLDSHARED="false"
@@ -627,8 +629,7 @@ case "$host_os" in
                        LDSHFLAGS="-Wl,-h,\$@ -G"
                        PICFLAG="-KPIC -O2"   # Is this correct for SunOS
                ;;
-               *bsd*) LDSHFLAGS="-shared -Bshareable"
-                       BLDSHARED="true"
+               *bsd*)  BLDSHARED="true"
                        LDSHFLAGS="-Wl,-soname,\$@ -shared"
                        PICFLAG="-fPIC -O2"
                ;;