diff options
| author | Björn Jacke <bj@sernet.de> | 2009-10-30 19:54:52 +0100 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2009-10-31 00:48:20 +0100 |
| commit | 4ae950d211cfb17e086e4e3068ff351effb2b5a0 (patch) | |
| tree | 8c5ba860873dc5da372c7c997cd1c2566a4111d0 | |
| parent | 72cec4a03145e11d299a5b679bb4a7ed6818032b (diff) | |
| download | samba-4ae950d211cfb17e086e4e3068ff351effb2b5a0.tar.gz samba-4ae950d211cfb17e086e4e3068ff351effb2b5a0.tar.bz2 samba-4ae950d211cfb17e086e4e3068ff351effb2b5a0.zip | |
ѕ3:buildsystem: fix depenencies for libreplace
This problem became visible after adding the picky -z defs linker option: On
Solaris libreplace had unresolved symbols, which showed up in the libtalloc
build. PAM_WINBIND_EXTRA_LIBS and WINBIND_NSS_EXTRA_LIBS had been workarounds
to make things work at two placeѕ. These variables have been obsoleted now.
This patch introduces LIBREPLACE_LIBS which contans the linker flags needed for
linking anything using libreplace.
| -rw-r--r-- | source3/Makefile.in | 7 | ||||
| -rw-r--r-- | source3/configure.in | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 748bfd3083..36729182d4 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -72,14 +72,13 @@ NSCD_LIBS=@NSCD_LIBS@ UUID_LIBS=@UUID_LIBS@ LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@ -WINBIND_NSS_EXTRA_LIBS=@WINBIND_NSS_EXTRA_LIBS@ WINBIND_NSS_PTHREAD=@WINBIND_NSS_PTHREAD@ -PAM_WINBIND_EXTRA_LIBS=@PAM_WINBIND_EXTRA_LIBS@ DNSSD_LIBS=@DNSSD_LIBS@ AVAHI_LIBS=@AVAHI_LIBS@ POPT_LIBS=@POPTLIBS@ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@ LIBTALLOC_LIBS=@LIBTALLOC_LIBS@ +LIBREPLACE_LIBS=@LIBREPLACE_LIBS@ LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@ LIBTDB_LIBS=@LIBTDB_LIBS@ LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@ @@ -2514,7 +2513,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ) @echo "Linking $@" @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \ - $(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \ + $(LIBREPLACE_LIBS) $(WINBIND_NSS_PTHREAD) \ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) $(LIBTALLOC) $(LIBTDB) @@ -2531,7 +2530,7 @@ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OB bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \ - $(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` + $(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@` ########## # Plugins: diff --git a/source3/configure.in b/source3/configure.in index 4a54e6670b..76ef1510be 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -696,6 +696,10 @@ LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"` LIBREPLACE_OBJS="${LIBREPLACEOBJ}" AC_SUBST(LIBREPLACE_OBJS) +LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}" +AC_SUBST(LIBREPLACE_LIBS) + + # add -ldl to the global LIBS LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}" AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}" @@ -5956,8 +5960,6 @@ case "$host_os" in NSSSONAMEVERSIONSUFFIX=".1" WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o \ ../nsswitch/winbind_nss_linux.o" - WINBIND_NSS_EXTRA_LIBS="${LIBREPLACE_NETWORK_LIBS}" - PAM_WINBIND_EXTRA_LIBS="${LIBREPLACE_NETWORK_LIBS}" ;; *hpux11*) WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o" @@ -6065,9 +6067,7 @@ AC_SUBST(WINBIND_NSS) AC_SUBST(WINBIND_WINS_NSS) AC_SUBST(WINBIND_NSS_LDSHFLAGS) AC_SUBST(WINBIND_NSS_EXTRA_OBJS) -AC_SUBST(WINBIND_NSS_EXTRA_LIBS) AC_SUBST(NSSSONAMEVERSIONSUFFIX) -AC_SUBST(PAM_WINBIND_EXTRA_LIBS) AC_SUBST(WINBIND_KRB5_LOCATOR) |