From 6be982c32e50e02ca08cb70e5ea76a568f7834da Mon Sep 17 00:00:00 2001
From: "mhammond%skippinet.com.au" <mhammond%skippinet.com.au>
Date: Thu, 2 May 2002 11:05:25 +0000
Subject: [PATCH] Moving towards full autoconf build support.

Not part of the build.
---
 extensions/python/xpcom/src/Makefile.in       | 25 +++++++------------
 .../python/xpcom/src/loader/Makefile.in       | 17 +++++--------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/extensions/python/xpcom/src/Makefile.in b/extensions/python/xpcom/src/Makefile.in
index 1cfeafc6556..4f651a61e39 100644
--- a/extensions/python/xpcom/src/Makefile.in
+++ b/extensions/python/xpcom/src/Makefile.in
@@ -40,31 +40,23 @@ DEPTH=../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+PYTHON_INCLUDES = @MOZ_PYTHON_INCLUDES@
+PYTHON_LIBS = @MOZ_PYTHON_LIBS@
+PYTHON_DEBUG_SUFFIX = @MOZ_PYTHON_DEBUG_SUFFIX@
+PYTHON_DLL_SUFFIX = @MOZ_PYTHON_DLL_SUFFIX@
 
 DIRS = loader $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
-PYTHON_DEBUG_SUFFIX=
-ifdef MOZ_DEBUG
-ifeq ($(OS_ARCH),WINNT)
-PYTHON_DEBUG_SUFFIX=_d
-endif
-endif
-
 MODULE		= pyxpcom
 LIBRARY_NAME	= _xpcom$(PYTHON_DEBUG_SUFFIX)
 #MODULE_NAME	= 
 REQUIRES	= xpcom string $(NULL)
 
-ifeq ($(OS_ARCH),WINNT)
-DLL_SUFFIX=.pyd
-LOCAL_INCLUDES = -I$(PYTHON_SRC)/Include -I$(PYTHON_SRC)/PC
-EXTRA_LIBS += /libpath:$(PYTHON_SRC)/PCBuild
-else
-LOCAL_INCLUDES = -I$(PYTHON_SRC)/include/python2.1
-EXTRA_LIBS += -L$(PYTHON_SRC)/lib -lpython2.1
-endif
+DLL_SUFFIX=$(PYTHON_DLL_SUFFIX)
+LOCAL_INCLUDES = $(PYTHON_INCLUDES)
+EXTRA_LIBS += $(PYTHON_LIBS)
 
 CPPSRCS= \
 	ErrorUtils.cpp \
@@ -82,6 +74,7 @@ CPPSRCS= \
 	PyIInterfaceInfoManager.cpp \
 	PyISimpleEnumerator.cpp \
 	PyISupports.cpp \
+	PyIVariant.cpp \
 	Pyxpt_info.cpp \
 	TypeObject.cpp \
 	VariantUtils.cpp \
@@ -108,4 +101,4 @@ endif
 	rm -f $(DIST)/lib/$(IMPORT_LIBRARY)
 
 clobber::
-	rm -f *.ilk
+	rm -f *.ilk *.pdb
diff --git a/extensions/python/xpcom/src/loader/Makefile.in b/extensions/python/xpcom/src/loader/Makefile.in
index a80e8c98f45..822d1cca6de 100644
--- a/extensions/python/xpcom/src/loader/Makefile.in
+++ b/extensions/python/xpcom/src/loader/Makefile.in
@@ -41,23 +41,18 @@ DEPTH=../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+PYTHON_INCLUDES = @MOZ_PYTHON_INCLUDES@
+PYTHON_LIBS = @MOZ_PYTHON_LIBS@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_DEBUG
-PYTHON_DEBUG_SUFFIX=_d
-else
-PYTHON_DEBUG_SUFFIX=
-endif
-
-MODULE		= pyloader
-LIBRARY_NAME	= pyloader$(PYTHON_DEBUG_SUFFIX)
+#MODULE		= pyloader
+LIBRARY_NAME	= pyloader
 IS_COMPONENT	= 1
-#MODULE_NAME	= 
 REQUIRES	= xpcom string $(NULL)
 
-LOCAL_INCLUDES = -I$(PYTHON_SRC)/Include -I$(PYTHON_SRC)/PC
-EXTRA_LIBS += /libpath:$(PYTHON_SRC)/PCBuild
+LOCAL_INCLUDES = $(PYTHON_INCLUDES)
+EXTRA_LIBS += $(PYTHON_LIBS)
 
 CPPSRCS		=		   \
 		pyloader.cpp	   \