diff options
| author | Richard Sharpe <sharpe@samba.org> | 2001-07-14 02:52:41 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2001-07-14 02:52:41 +0000 |
| commit | 57673d585a532a783cb0c0b61a652bbe7e3e7cf6 (patch) | |
| tree | f2bca1eef48591f7ffd20d84192500a8f4fd7f4a | |
| parent | afa73000063d7c3eb94ccc7b423c8a7bea28f9a5 (diff) | |
| download | samba-57673d585a532a783cb0c0b61a652bbe7e3e7cf6.tar.gz samba-57673d585a532a783cb0c0b61a652bbe7e3e7cf6.tar.bz2 samba-57673d585a532a783cb0c0b61a652bbe7e3e7cf6.zip | |
A few tweaks around linking libsmbclient
(This used to be commit 83334fc474008d9f338204e73eacc5665e26bf0c)
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/configure.in | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f3e8b284d6..d81729e6b8 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/configure.in b/source3/configure.in index 721cdd93c2..805e8c0b06 100644 --- a/source3/configure.in +++ b/source3/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" ;; |