diff --git a/source3/Makefile.in b/source3/Makefile.in
index dacc947d614..5688cf2d622 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -12,9 +12,8 @@ LIBS=@LIBS@
 CC=@CC@
 SHLD=@SHLD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
-LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
+LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
 AWK=@AWK@
 
 TERMLDFLAGS=@TERMLDFLAGS@
@@ -69,7 +68,7 @@ LOCKDIR = @lockdir@
 # man pages language(s)
 man_langs = "@manlangs@"
 
-FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  $(CPPFLAGS) -I. -I$(srcdir)
+FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. -I$(srcdir)
 FLAGS2 = 
 FLAGS3 = 
 FLAGS4 = 
diff --git a/source3/configure b/source3/configure
index 33ceb1b97b0..fc515f70e11 100755
--- a/source3/configure
+++ b/source3/configure
@@ -8712,7 +8712,7 @@ else
    ac_cv_shlib_works=no
    # try building a trivial shared library
    $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
-     $CC $LDSHFLAGS -o shlib.so shlib.po &&
+     $CC $CPPFLAGS $CFLAGS $LDSHFLAGS -o shlib.so shlib.po &&
      ac_cv_shlib_works=yes
    rm -f shlib.so shlib.po
 
@@ -13313,7 +13313,7 @@ fi
 
 # Display test results
 
-if test x"$HAVE_WINBIND" = x"yes"; then
+if test x"$HAVE_WINBIND" = x"yes" && test x"$BLDSHARED" = x"true"; then
 
         echo "$ac_t""yes" 1>&6
 
diff --git a/source3/configure.in b/source3/configure.in
index 46b82af4b2d..2340a1129c0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -782,7 +782,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
    ac_cv_shlib_works=no
    # try building a trivial shared library
    $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
-     $CC $LDSHFLAGS -o shlib.so shlib.po &&
+     $CC $CPPFLAGS $CFLAGS $LDSHFLAGS -o shlib.so shlib.po &&
      ac_cv_shlib_works=yes
    rm -f shlib.so shlib.po
 ])
@@ -2538,7 +2538,7 @@ fi
 
 # Display test results
 
-if test x"$HAVE_WINBIND" = x"yes"; then
+if test x"$HAVE_WINBIND" = x"yes" && test x"$BLDSHARED" = x"true"; then
 
         AC_MSG_RESULT(yes)