get rid of CFLAGS from LDSHFLAGS and WINBIND_NSS_LDSHFLAGS and instead

define it in SHLD for those systems the use CC for SHLD.
(This used to be commit d0e2f3d1098ac0b8fa9165b3a93cd8d325a7a0d9)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8ad43bcbcaff762f2871612bb55eb1e1c4959c74..91c0fe983d4fda21c597d734b44143140c29794e 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 489d65519099bdcfb59cd1081a56f869b4efd1b8..3a940b8da81367ff98535fdb02561868e03e1706 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -954,7 +954,7 @@ BLDSHARED="false"
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
 SONAMEFLAG="#"
-SHLD="\${CC}"
+SHLD="\${CC} \${CFLAGS}"
 PICFLAG=""
 PICSUFFIX="po"
 POBAD_CC="#"