summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-05 01:40:10 +0000
committerTim Potter <tpot@samba.org>2003-05-05 01:40:10 +0000
commit73a3105b574c00f80a0f10c3b9fa4d3bba3bd7d7 (patch)
tree692587fe0442c300bd78ee4be4d0f92b809c1230
parent87c66258ecae5a6a25a896e2a7850b07d8f1df1e (diff)
downloadsamba-73a3105b574c00f80a0f10c3b9fa4d3bba3bd7d7.tar.gz
samba-73a3105b574c00f80a0f10c3b9fa4d3bba3bd7d7.tar.bz2
samba-73a3105b574c00f80a0f10c3b9fa4d3bba3bd7d7.zip
AIX doesn't append $SHLIB_EXT to NSS libraries.
(This used to be commit af083d2760c79ef33b7e187a5c5a6238667da24e)
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in7
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3d99315777..6715f7c7f9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -640,7 +640,7 @@ smbfilter : SHOWFLAGS bin/smbfilter@EXEEXT@
talloctort : SHOWFLAGS bin/talloctort@EXEEXT@
-nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ nsswitch/@WINBIND_NSS@.@SHLIBEXT@ nsswitch/pam_winbind.@SHLIBEXT@
+nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ nsswitch/@WINBIND_NSS@ nsswitch/pam_winbind.@SHLIBEXT@
wins : SHOWFLAGS nsswitch/libnss_wins.@SHLIBEXT@
@@ -966,7 +966,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS) \
@LDAP_LIBS@
-nsswitch/@WINBIND_NSS@.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
+nsswitch/@WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
@echo "Linking $@"
@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
diff --git a/source3/configure.in b/source3/configure.in
index a5e680f3fa..18284c5c15 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3198,7 +3198,7 @@ HAVE_WINBIND=yes
# Define the winbind shared library name and any specific linker flags
# it needs to be built with.
-WINBIND_NSS=libnss_winbind
+WINBIND_NSS=libnss_winbind.$SHLIBEXT
WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
case "$host_os" in
@@ -3207,7 +3207,7 @@ case "$host_os" in
;;
*irix*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_irix.o"
- WINBIND_NSS="libns_winbind"
+ WINBIND_NSS="libns_winbind.$SHLIBEXT"
;;
*solaris*)
# Solaris winbind client is implemented as a wrapper around
@@ -3222,6 +3222,7 @@ case "$host_os" in
*aix*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_aix.o"
WINBIND_NSS_LDSHFLAGS="-Wl,-bexpall,-bM:SRE,-ewb_aix_init"
+ WINBIND_NSS="WINBIND"
;;
*)
HAVE_WINBIND=no
@@ -3268,7 +3269,7 @@ if test x"$HAVE_WINBIND" = x"yes"; then
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
if test x"$BLDSHARED" = x"true"; then
- SHLIB_PROGS="$SHLIB_PROGS nsswitch/$WINBIND_NSS.$SHLIBEXT"
+ SHLIB_PROGS="$SHLIB_PROGS nsswitch/$WINBIND_NSS"
if test x"$with_pam" = x"yes"; then
SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT"