- fixed my breakage of CPPFLAGS

- allow winbindd and wbinfo to build without shared libraries

source/Makefile.in

@@ -12,6 +12,7 @@ LIBS=@LIBS@
 CC=@CC@
 SHLD=@SHLD@
 CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
 AWK=@AWK@
@@ -68,7 +69,7 @@ LOCKDIR = @lockdir@
 # man pages language(s)
 man_langs = "@manlangs@"
 
-FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. -I$(srcdir)
+FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
 FLAGS2 = 
 FLAGS3 = 
 FLAGS4 = 

source/configure.in

@@ -2538,25 +2538,25 @@ fi
 
 # Display test results
 
-if test x"$HAVE_WINBIND" = x"yes" && test x"$BLDSHARED" = x"true"; then
 
+WINBIND_TARGETS=""
+WINBIND_STARGETS=""
+WINBIND_LTARGETS=""
+WINBIND_PAM_PROGS=""
+
+if test x"$HAVE_WINBIND" = x"yes"; then
         AC_MSG_RESULT(yes)
 
 	WINBIND_TARGETS="bin/wbinfo"
 	WINBIND_STARGETS="bin/winbindd"
-	WINBIND_LTARGETS="nsswitch/libnss_winbind.so"
-	case "$with_pam" in
-		yes)
+        if test x"$BLDSHARED" = x"true"; then
+		WINBIND_LTARGETS="nsswitch/libnss_winbind.so"
+		if test x"$with_pam" = x"yes"; then
 			WINBIND_PAM_TARGETS="nsswitch/pam_winbind.so"
-		;;
-	esac
+		fi
+	fi
 else
         AC_MSG_RESULT(no$winbind_no_reason)
-
-	WINBIND_TARGETS=""
-	WINBIND_STARGETS=""
-	WINBIND_LTARGETS=""
-	WINBIND_PAM_PROGS=""
 fi
 
 # Substitution time!