From 9693d442cd05ace074afc0e67fb94e50b12fb7bd Mon Sep 17 00:00:00 2001
From: Dave Schuyler <nthparameter@gmail.com>
Date: Fri, 2 Apr 2004 02:41:14 +0000
Subject: [PATCH] added PYTHON_FRAMEWORK

---
 dtool/LocalSetup.pp                            | 2 ++
 dtool/metalibs/dtoolconfig/pydtool.cxx         | 7 ++++++-
 dtool/src/interrogate/interfaceMakerPython.cxx | 8 ++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index f58ac11b91..72ffab5e83 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -15,6 +15,8 @@
 
 /* Define if we have Python installed.  */
 $[cdefine HAVE_PYTHON]
+/* Define if we have Python as a framework (Mac OS X).  */
+$[cdefine PYTHON_FRAMEWORK]
 
 /* Define if we have RAD game tools, Miles Sound System installed.  */
 $[cdefine HAVE_RAD_MSS]
diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx
index b446f0b7cc..54ec153fe1 100644
--- a/dtool/metalibs/dtoolconfig/pydtool.cxx
+++ b/dtool/metalibs/dtoolconfig/pydtool.cxx
@@ -9,7 +9,12 @@
 #include "dtoolbase.h"
 
 #undef HAVE_LONG_LONG
-#include "Python.h"
+
+#ifdef PYTHON_FRAMEWORK
+  #include "Python/Python.h"
+#else
+  #include "Python.h"
+#endif
 
 extern "C" {
 
diff --git a/dtool/src/interrogate/interfaceMakerPython.cxx b/dtool/src/interrogate/interfaceMakerPython.cxx
index 0e475ac868..1d5fafad91 100644
--- a/dtool/src/interrogate/interfaceMakerPython.cxx
+++ b/dtool/src/interrogate/interfaceMakerPython.cxx
@@ -41,8 +41,12 @@ InterfaceMakerPython(InterrogateModuleDef *def) :
 void InterfaceMakerPython::
 write_includes(ostream &out) {
   InterfaceMaker::write_includes(out);
-  out << "#undef HAVE_LONG_LONG\n"
-      << "#include <Python.h>\n\n";
+  out << "#undef HAVE_LONG_LONG\n\n"
+      << "#if PYTHON_FRAMEWORK\n"
+      << "  #include \"Python/Python.h\"\n"
+      << "#else\n"
+      << "  #include \"Python.h\"\n"
+      << "#endif\n\n";
 }
 
 ////////////////////////////////////////////////////////////////////