summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-05 01:52:08 +0000
committerTim Potter <tpot@samba.org>2003-05-05 01:52:08 +0000
commit4b8d28f8320ebf8d9ee1105e36c95ad0e3a4579c (patch)
treec45b936fdd337c878b653e51c179a52378740aac /source3
parent722791b4f8a4c7b4ea3deeafad0b13cb41a5c214 (diff)
downloadsamba-4b8d28f8320ebf8d9ee1105e36c95ad0e3a4579c.tar.gz
samba-4b8d28f8320ebf8d9ee1105e36c95ad0e3a4579c.tar.bz2
samba-4b8d28f8320ebf8d9ee1105e36c95ad0e3a4579c.zip
AIX doesn't append $SHLIB_EXT to NSS libraries.
Also merged a little bit of abartlet's recent configure.in change of duplicated IRIX stuff. (This used to be commit d15406ad910bc952c741e8d4d574064dbc5e88ef)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in15
2 files changed, 7 insertions, 12 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5e28f6eb4f..985bdad08f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -657,7 +657,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@
@@ -979,7 +979,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 cd3b2cedcc..77d160e4cb 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3212,7 +3212,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
@@ -3221,7 +3221,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
@@ -3236,6 +3236,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
@@ -3282,14 +3283,8 @@ 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
- case "$host_os" in
- *irix*)
- SHLIB_PROGS="$SHLIB_PROGS nsswitch/libns_winbind.$SHLIBEXT"
- ;;
- *)
- SHLIB_PROGS="$SHLIB_PROGS nsswitch/libnss_winbind.$SHLIBEXT"
- ;;
- esac
+ SHLIB_PROGS="$SHLIB_PROGS nsswitch/$WINBIND_NSS"
+
if test x"$with_pam" = x"yes"; then
SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT"
fi