Fixes to linker flags for AIX winbind client from Stephen Roylance.

(This used to be commit 1cc5b2881c61db7aadd886008fcfb81e351e651a)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cf8791a9a83fbff65f6184e8b7764e0978e71ea1..99e557b7a74dfbad15b34e20100d599a53975cc5 100644 (file)
--- 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 2b086d3d3b154cad8060c4ec2e6282f2e60d2796..c2b7ae276543d4a4b1c1173bbf9648e7eb84a5e2 100644 (file)
--- 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)