Bug 3856 - Rearrange in configure.in for NSSSONAMEVERSIONSUFFIX
Rearrange in configure.in for NSSSONAMEVERSIONSUFFIX
Status: RESOLVED FIXED
Product: Samba 3.0
Classification: Unclassified
Component: Build environment
3.0.23
Other FreeBSD
: P3 normal
: none
Assigned To: Tim Potter
Samba QA Contact
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2006-06-25 21:37 UTC by Timur Bakeyev
Modified: 2006-10-19 16:53 UTC (History)
0 users

See Also:


Attachments
Add FreeBSD as yet another platform, that needs suffix for NSS module (2.90 KB, patch)
2006-06-25 21:38 UTC, Timur Bakeyev
no flags Details
Fixed patch (2.14 KB, patch)
2006-06-25 21:45 UTC, Timur Bakeyev
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Timur Bakeyev 2006-06-25 21:37:10 UTC
Just found this new variable in the configure.in to add specific NSS suffix to .so libraries and want to add FreeBSD as yet another platform, that needs such suffix. To be able to do it in a cleaner way I slightly rearranged position of declaration and it's propagation into Makefile.in.

Hope, it makes all code more structured and organized.

Patch is attached.

Cheers,
Timur
Comment 1 Timur Bakeyev 2006-06-25 21:38:02 UTC
Created attachment 1982 [details]
Add FreeBSD as yet another platform, that needs suffix for NSS module
Comment 2 Timur Bakeyev 2006-06-25 21:44:45 UTC
Comment on attachment 1982 [details]
Add FreeBSD as yet another platform, that needs suffix for NSS module

>--- configure.in.orig	Thu Apr 20 04:29:46 2006
>+++ configure.in	Tue Apr 25 02:04:24 2006
>@@ -242,7 +242,6 @@
> AC_SUBST(SHELL)
> AC_SUBST(LDSHFLAGS)
> AC_SUBST(SONAMEFLAG)
>-AC_SUBST(NSSSONAMEVERSIONSUFFIX)
> AC_SUBST(SHLD)
> AC_SUBST(HOST_OS)
> AC_SUBST(PICFLAGS)

>@@ -1552,7 +1566,6 @@
> HOST_OS="$host_os"
> LDSHFLAGS="-shared"
> SONAMEFLAG="#"
>-NSSSONAMEVERSIONSUFFIX=""
> SHLD="\${CC} \${CFLAGS}"
> PICFLAGS=""
> PICSUFFIX="po"
>@@ -1577,7 +1590,6 @@
> 			DYNEXP="-Wl,--export-dynamic"
> 			PICFLAGS="-fPIC"
> 			SONAMEFLAG="-Wl,-soname="
>-			NSSSONAMEVERSIONSUFFIX=".2"
> 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
> 			;;
> 		*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
>@@ -1587,7 +1599,6 @@
> 			if test "${GCC}" = "yes"; then
> 				PICFLAGS="-fPIC"
> 				SONAMEFLAG="-Wl,-soname="
>-				NSSSONAMEVERSIONSUFFIX=".1"
> 				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
> 					DYNEXP="-Wl,-E"
> 				fi
>@@ -5208,18 +5219,21 @@
> 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"
>-		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
>+		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
>+		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
> 		;;
> 	*irix*)
> 		# IRIX has differently named shared libraries
>@@ -5230,6 +5244,7 @@
> 	*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"
>@@ -5256,6 +5271,7 @@
> 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
>
Comment 3 Timur Bakeyev 2006-06-25 21:45:29 UTC
Created attachment 1983 [details]
Fixed patch
Comment 4 Gerald (Jerry) Carter 2006-10-19 16:53:30 UTC
looks good.  Checking in.