Author: vlendec Date: 2007-05-05 22:47:07 +0000 (Sat, 05 May 2007) New Revision: 22692
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22692 Log: Fix compilation of explicit --without-winbind. Thanks to Tom Bork for reporting this! Volker Modified: branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0_25/source/configure.in branches/SAMBA_3_0_26/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2007-05-05 21:13:40 UTC (rev 22691) +++ branches/SAMBA_3_0/source/configure.in 2007-05-05 22:47:07 UTC (rev 22692) @@ -5925,10 +5925,6 @@ AC_SUBST(WINBIND_NSS_EXTRA_LIBS) AC_SUBST(NSSSONAMEVERSIONSUFFIX) -if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then - NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" -fi - AC_SUBST(SMB_KRB5_LOCATOR) # Check the setting of --with-winbind @@ -5963,6 +5959,10 @@ WINBIND_WINS_NSS="" fi +if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then + NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" +fi + if test x"$HAVE_WINBIND" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind]) Modified: branches/SAMBA_3_0_25/source/configure.in =================================================================== --- branches/SAMBA_3_0_25/source/configure.in 2007-05-05 21:13:40 UTC (rev 22691) +++ branches/SAMBA_3_0_25/source/configure.in 2007-05-05 22:47:07 UTC (rev 22692) @@ -5764,10 +5764,6 @@ AC_SUBST(WINBIND_NSS_EXTRA_LIBS) AC_SUBST(NSSSONAMEVERSIONSUFFIX) -if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then - NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" -fi - AC_SUBST(SMB_KRB5_LOCATOR) # Check the setting of --with-winbind @@ -5802,6 +5798,10 @@ WINBIND_WINS_NSS="" fi +if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then + NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" +fi + if test x"$HAVE_WINBIND" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind]) Modified: branches/SAMBA_3_0_26/source/configure.in =================================================================== --- branches/SAMBA_3_0_26/source/configure.in 2007-05-05 21:13:40 UTC (rev 22691) +++ branches/SAMBA_3_0_26/source/configure.in 2007-05-05 22:47:07 UTC (rev 22692) @@ -5764,10 +5764,6 @@ AC_SUBST(WINBIND_NSS_EXTRA_LIBS) AC_SUBST(NSSSONAMEVERSIONSUFFIX) -if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then - NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" -fi - AC_SUBST(SMB_KRB5_LOCATOR) # Check the setting of --with-winbind @@ -5802,6 +5798,10 @@ WINBIND_WINS_NSS="" fi +if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then + NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" +fi + if test x"$HAVE_WINBIND" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind])