summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2006-02-09 21:26:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:00 -0500
commit34352fe039fb0fc08ce7a410d913da6d4342f809 (patch)
tree99e1fa2f0b739eb47bf7183a53ba7509327d1bae
parent45f2e5997b8c9e95ddf5831926ff6bc5243a74f7 (diff)
downloadsamba-34352fe039fb0fc08ce7a410d913da6d4342f809.tar.gz
samba-34352fe039fb0fc08ce7a410d913da6d4342f809.tar.bz2
samba-34352fe039fb0fc08ce7a410d913da6d4342f809.zip
r13417: Add .2 to the SONAME as version suffix if we link the nss modules on
linux. Heads up: This might be required on other OS using glibc too. (This used to be commit b28e43427b43994404f109ce7da467461af12200)
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 00800ca953..d8f7dcf519 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1178,13 +1178,13 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
@echo "Linking $@"
@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
- @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
+ @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@
@WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
$(LDAP_LIBS) $(KRB5LIBS) \
- @SONAMEFLAG@`basename $@`
+ @SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@
nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
@echo "Linking $@"
diff --git a/source3/configure.in b/source3/configure.in
index 932a902c8f..2c969a9c41 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -206,6 +206,7 @@ dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
AC_SUBST(LDSHFLAGS)
AC_SUBST(SONAMEFLAG)
+AC_SUBST(SONAMEVERSIONSUFFIX)
AC_SUBST(SHLD)
AC_SUBST(HOST_OS)
AC_SUBST(PICFLAGS)
@@ -1382,6 +1383,7 @@ BLDSHARED="false"
HOST_OS="$host_os"
LDSHFLAGS="-shared"
SONAMEFLAG="#"
+SONAMEVERSIONSUFFIX=""
SHLD="\${CC} \${CFLAGS}"
PICFLAGS=""
PICSUFFIX="po"
@@ -1406,6 +1408,7 @@ if test "$enable_shared" = "yes"; then
DYNEXP="-Wl,--export-dynamic"
PICFLAGS="-fPIC"
SONAMEFLAG="-Wl,-soname="
+ SONAMEVERSIONSUFFIX=".2"
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;
*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])