get rid of CFLAGS from LDSHFLAGS and WINBIND_NSS_LDSHFLAGS and instead

define it in SHLD for those systems that use CC for SHLD
(This used to be commit 142c54ca924bd854e7d840c2a67692c9f61ee396)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 77af73f5b89f8433eafa1ca44ae220abc71dca7c..c81fdd4a832b18b04ab2f6b6d4b364575b96d552 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -18,8 +18,8 @@ CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 EXEEXT=@EXEEXT@
 LDFLAGS=@LDFLAGS@
-LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
-WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
+LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
+WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
 AWK=@AWK@
 DYNEXP=@DYNEXP@
 PYTHON=@PYTHON@

diff --git a/source3/configure.in b/source3/configure.in
index 93cbb0a871be12fddbda8ac3854210760017a280..533757aab836c8564a86e2be3f0c583c4de061c9 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -910,7 +910,7 @@ BLDSHARED="false"
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
 SONAMEFLAG="#"
-SHLD="\${CC}"
+SHLD="\${CC} \${CFLAGS}"
 PICFLAG=""
 PICSUFFIX="po"
 POBAD_CC="#"