From cd4da802f18de6d007186884c3646d5d6717abd5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 15 Apr 2003 06:54:27 +0000
Subject: Merge of python extension picobj fix. (This used to be commit
 7e0e9585f1357afe1ff96399daea421e1860414b)

---
 source3/Makefile.in | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5592d03092..eb54473092 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1054,23 +1054,29 @@ installclientlib:
 
 # Python extensions
 
-PYTHON_OBJS = $(LIB_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) $(UBIQX_OBJ) \
-	$(PARAM_OBJ) $(LIBMSRPC_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+PYTHON_OBJS = $(PARAM_OBJ) $(LIB_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \
+	$(UBIQX_OBJ) $(LIBMSRPC_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 	$(SECRETS_OBJ) $(KRBCLIENT_OBJ)
 
-python_ext: $(PYTHON_OBJS)
+PYTHON_PICOBJS = $(PYTHON_OBJS:.o=.po)
+
+python_ext: $(PYTHON_PICOBJS)
 	@if test -z "$(PYTHON)"; then \
 		echo Use the option --with-python to configure python; \
-		exit 1; fi
-	PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-	LIBS="$(LIBS)" \
+		exit 1; \
+	fi
+	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
+	LIBS="$(LIBS) $(PASSDBLIBS) $(KRB5LIBS)" \
 		$(PYTHON) python/setup.py build
 
-python_install: $(PYTHON_OBJS)
+python_install: $(PYTHON_PICOBJS)
 	@if test -z "$(PYTHON)"; then \
 		echo Use the option --with-python to configure python; \
-		exit 1; fi
-	PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+		exit 1; \
+	fi
+	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
+	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
 	LIBS="$(LIBS)" \
 		$(PYTHON) python/setup.py install
 
-- 
cgit