From 61c08e254eeca697663e99c66d5469e49c8f9626 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 11 Jun 2001 16:04:44 +0000
Subject: [PATCH] allow removing interrogate from the build process

---
 dtool/Config.pp                    |  6 ++++++
 dtool/pptempl/Global.pp            |  1 +
 dtool/src/cppparser/Sources.pp     |  2 ++
 dtool/src/interrogate/Sources.pp   |  2 ++
 dtool/src/interrogatedb/Sources.pp | 13 -------------
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index cb71734aca..008b1d9078 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -120,6 +120,12 @@
 // Studio code.
 #define INTERROGATE_C_INTERFACE
 
+// Do you even want to build interrogate at all?  This is the program
+// that reads our C++ source files and generates one of the above
+// interfaces.  If you won't be building the interfaces, you don't
+// need the program.
+#defer HAVE_INTERROGATE $[or $[INTERROGATE_PYTHON_INTERFACE],$[INTERROGATE_C_INTERFACE]]
+
 // What additional options should be passed to interrogate when
 // generating either of the above two interfaces?  Generally, you
 // probably don't want to mess with this.
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 9008d60791..cf1f0fa6e4 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -237,6 +237,7 @@
      $[or $[not $[DIRECTORY_IF_IPC]],$[HAVE_IPC]], \
      $[or $[not $[DIRECTORY_IF_NET]],$[HAVE_NET]], \
      $[or $[not $[DIRECTORY_IF_AUDIO]],$[HAVE_AUDIO]], \
+     $[or $[not $[DIRECTORY_IF_INTERROGATE]],$[HAVE_INTERROGATE]], \
       1 ]
 
 // This variable, when evaluated in the scope of a particular target,
diff --git a/dtool/src/cppparser/Sources.pp b/dtool/src/cppparser/Sources.pp
index eabe5201c8..973fb24527 100644
--- a/dtool/src/cppparser/Sources.pp
+++ b/dtool/src/cppparser/Sources.pp
@@ -1,3 +1,5 @@
+#define DIRECTORY_IF_INTERROGATE yes
+
 #define LOCAL_LIBS dtoolutil dtoolbase
 #define YACC_PREFIX cppyy
 
diff --git a/dtool/src/interrogate/Sources.pp b/dtool/src/interrogate/Sources.pp
index e906f8c09b..ccd4559433 100644
--- a/dtool/src/interrogate/Sources.pp
+++ b/dtool/src/interrogate/Sources.pp
@@ -1,3 +1,5 @@
+#define DIRECTORY_IF_INTERROGATE yes
+
 #define LOCAL_LIBS cppParser pystub interrogatedb dconfig dtoolutil dtoolbase
 
 #begin bin_target
diff --git a/dtool/src/interrogatedb/Sources.pp b/dtool/src/interrogatedb/Sources.pp
index 850d0f2b33..bf3ecdeb8a 100644
--- a/dtool/src/interrogatedb/Sources.pp
+++ b/dtool/src/interrogatedb/Sources.pp
@@ -29,17 +29,4 @@
     interrogate_interface.h interrogate_request.h vector_int.h \
     config_interrogatedb.h
 
-// These are temporary; they need not be installed in the future.  These are
-// necessary only when using template stopgap.
-  #define INSTALL_HEADERS \
-    $[INSTALL_HEADERS] \
-    interrogateComponent.h interrogateComponent.I \
-    interrogateType.h interrogateType.I \
-    interrogateFunction.h interrogateFunction.I \
-    interrogateFunctionWrapper.h interrogateFunctionWrapper.I \
-    interrogateManifest.h interrogateManifest.I \
-    interrogateElement.h interrogateElement.I \
-    interrogateDatabase.h interrogateDatabase.I \
-    indexRemapper.h
-
 #end lib_target