diff options
| author | Gerald Carter <jerry@samba.org> | 2006-10-19 22:28:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:33 -0500 |
| commit | 7ac5df4824f3ad464276b6deeee6cecfe9e21c76 (patch) | |
| tree | 72dd5b46a35e075bf4b2ac15273f969acfed8f41 | |
| parent | a2dfdfbf86e51273713f2082ce92831f7fcec455 (diff) | |
| download | samba-7ac5df4824f3ad464276b6deeee6cecfe9e21c76.tar.gz samba-7ac5df4824f3ad464276b6deeee6cecfe9e21c76.tar.bz2 samba-7ac5df4824f3ad464276b6deeee6cecfe9e21c76.zip | |
r19417: BUG 3856: patch from Timur Bakeyev <timur@com.bat.ru> to include setting the nss soname version on FreeBSD
(This used to be commit e1490e72eafbe3a2f9cc2e3a46563a75a19672e0)
| -rw-r--r-- | source3/configure.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in index 3215ece08c..91f582143c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -259,7 +259,6 @@ AC_SUBST(SAMBA_CPPFLAGS) AC_SUBST(SHELL) AC_SUBST(LDSHFLAGS) AC_SUBST(SONAMEFLAG) -AC_SUBST(NSSSONAMEVERSIONSUFFIX) AC_SUBST(SHLD) AC_SUBST(HOST_OS) AC_SUBST(PICFLAG) @@ -1651,7 +1650,6 @@ BLDSHARED="false" HOST_OS="$host_os" LDSHFLAGS="-shared" SONAMEFLAG="#" -NSSSONAMEVERSIONSUFFIX="" SHLD="\${CC} \${CFLAGS}" PICFLAG="${PIE_CFLAGS}" SHLIBEXT="so" @@ -1674,7 +1672,6 @@ case "$host_os" in DYNEXP="-Wl,--export-dynamic" PICFLAG="-fPIC" SONAMEFLAG="-Wl,-soname=" - NSSSONAMEVERSIONSUFFIX=".2" AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris]) @@ -1684,7 +1681,6 @@ case "$host_os" in if test "${GCC}" = "yes"; then PICFLAG="-fPIC" SONAMEFLAG="-Wl,-soname=" - NSSSONAMEVERSIONSUFFIX=".1" if test "${ac_cv_prog_gnu_ld}" = "yes"; then DYNEXP="-Wl,-E" fi @@ -5538,14 +5534,17 @@ HAVE_WINBIND=yes WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT" WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT" WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS +NSSSONAMEVERSIONSUFFIX="" case "$host_os" in *linux*) + NSSSONAMEVERSIONSUFFIX=".2" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" ;; *freebsd[[5-9]]*) # FreeBSD winbind client is implemented as a wrapper around # the Linux version. + NSSSONAMEVERSIONSUFFIX=".1" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ nsswitch/winbind_nss_linux.o" WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" @@ -5577,6 +5576,7 @@ case "$host_os" in *solaris*) # Solaris winbind client is implemented as a wrapper around # the Linux version. + NSSSONAMEVERSIONSUFFIX=".1" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \ nsswitch/winbind_nss_linux.o" WINBIND_NSS_EXTRA_LIBS="-lsocket" @@ -5603,6 +5603,7 @@ AC_SUBST(WINBIND_WINS_NSS) AC_SUBST(WINBIND_NSS_LDSHFLAGS) AC_SUBST(WINBIND_NSS_EXTRA_OBJS) AC_SUBST(WINBIND_NSS_EXTRA_LIBS) +AC_SUBST(NSSSONAMEVERSIONSUFFIX) # Check the setting of --with-winbind |