diff options
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/configure.in | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cf8791a9a8..99e557b7a7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -19,6 +19,7 @@ CPPFLAGS=@CPPFLAGS@ EXEEXT=@EXEEXT@ LDFLAGS=@LDFLAGS@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@ +WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ @CFLAGS@ AWK=@AWK@ DYNEXP=@DYNEXP@ PYTHON=@PYTHON@ @@ -954,7 +955,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy nsswitch/@WINBIND_NSS@.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS) @echo "Linking $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \ + @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \ @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@` nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy diff --git a/source3/configure.in b/source3/configure.in index 2b086d3d3b..c2b7ae2765 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3222,7 +3222,11 @@ AC_MSG_CHECKING(whether to build winbind) 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_LDSHFLAGS=$LDSHFLAGS case "$host_os" in *linux*) @@ -3244,6 +3248,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" ;; *) HAVE_WINBIND=no @@ -3252,6 +3257,7 @@ case "$host_os" in esac AC_SUBST(WINBIND_NSS) +AC_SUBST(WINBIND_NSS_LDSHFLAGS) AC_SUBST(WINBIND_NSS_EXTRA_OBJS) AC_SUBST(WINBIND_NSS_EXTRA_LIBS) |