[PATCH 3/5] s3: Fix build file due to file move

[Matthieu Patou]

  Use the new path of iniparser
  Allow pam_winbind.c to build without localedir.c
---
 source3/Makefile.in  |   13 ++++++++++---
 source3/configure.in |    2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6e40f83..8e79775 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -919,7 +919,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
 	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) 
 
-PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \
+PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
 
 LIBSMBCLIENT_THREAD_OBJ = \
@@ -1291,8 +1291,8 @@ WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)
 POPT_OBJ=../lib/popt/findme.o ../lib/popt/popt.o ../lib/popt/poptconfig.o \
           ../lib/popt/popthelp.o ../lib/popt/poptparse.o
 
-INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \
-		iniparser_build/strlib.o
+INIPARSER_OBJ = ../lib/iniparser_build/iniparser.o ../lib/iniparser_build/dictionary.o \
+		../lib/iniparser_build/strlib.o
 
 TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
 	$(SOCKET_WRAPPER_OBJ)
@@ -1520,6 +1520,13 @@ dynconfig.o: dynconfig.c Makefile
 		echo "$(COMPILE_CC_PATH)" 1>&2;\
 		$(COMPILE_CC_PATH) >/dev/null 2>&1
 
+../nsswitch/pam_winbind.o: ../nsswitch/pam_winbind.c Makefile
+	@echo Compiling $*.c
+	@$(COMPILE_CC_PATH) && exit 0;\
+		echo "The following command failed:" 1>&2;\
+		echo "$(COMPILE_CC_PATH)" 1>&2;\
+		$(COMPILE_CC_PATH) >/dev/null 2>&1
+
 localedir.o: localedir.c Makefile
 	@echo Compiling $*.c
 	@$(COMPILE_CC_PATH) && exit 0;\
diff --git a/source3/configure.in b/source3/configure.in
index 45d2563..7ba72bf 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6447,7 +6447,7 @@ if test x"$INCLUDED_INIPARSER" = x"yes"; then
     AC_MSG_RESULT(yes)
     BUILD_INIPARSER='$(INIPARSER_OBJ)'
 	INIPARSERLIBS=""
-    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
+    FLAGS1="$FLAGS1 -I\$(srcdir)/../lib/iniparser/src"
 else
     AC_MSG_RESULT(no)
 	BUILD_INIPARSER=""
-- 
1.6.3.3


--------------050803070908040701010406
Content-Type: text/x-patch;
 name="0002-nsswitch-libpam-remove-depedance-on-locale.h-use-dir.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0002-nsswitch-libpam-remove-depedance-on-locale.h-use-dir.pa";
 filename*1="tch"