From 26650d16eba855841d5c4937ba558cc456a32df5 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 10 Oct 2000 23:45:29 +0000
Subject: [PATCH] *** empty log message ***

---
 dtool/Config.pp                  | 35 +++++++++++++++++++++-----------
 dtool/LocalSetup.pp              | 14 +++++++++++++
 dtool/Package.pp                 |  2 ++
 panda/src/audio/Sources.pp       |  1 +
 panda/src/audiotraits/Sources.pp |  1 +
 panda/src/net/Sources.pp         |  2 ++
 6 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 50db759c1a..ae149a7510 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -163,6 +163,29 @@
 #define MIKMOD_CONFIG libmikmod-config
 #defer HAVE_MIKMOD $[bintest $[MIKMOD_CONFIG]]
 
+// Do you want to build the network interface?  What additional libraries
+// are required?
+#define NET_IPATH
+#define NET_LPATH
+#if $[eq $[PLATFORM],Win32]
+  #define NET_LIBS ws2_32.lib
+#else
+  #define NET_LIBS
+#endif
+#define HAVE_NET 1
+
+// Do you want to build the audio interface?  What additional
+// libraries are required?
+#define AUDIO_IPATH
+#define AUDIO_LPATH
+#if $[eq $[PLATFORM],Win32]
+  #define AUDIO_LIBS winmm.lib dsound.lib user32.lib ole32.lib dxguid.lib
+#else
+  #define AUDIO_LIBS
+#endif
+#define HAVE_AUDIO 1
+
+
 // Is Gtk-- installed?  How should we run the gtkmm-config program?
 // This matters only to programs in PANDATOOL.
 #define GTKMM_CONFIG gtkmm-config
@@ -172,18 +195,6 @@
 #define MAYA_LOCATION /usr/aw/maya2.5
 #defer HAVE_MAYA $[isdir $[MAYA_LOCATION]]
 
-// What additional libraries must we link with for network-dependent
-// code?
-#if $[eq $[PLATFORM],Win32]
-  #define NET_LIBS ws2_32.lib
-#endif
-
-// What additional libraries must we link with for audio-dependent
-// code?
-#if $[eq $[PLATFORM],Win32]
-  #define AUDIO_LIBS winmm.lib dsound.lib user32.lib ole32.lib dxguid.lib
-#endif
-
 
 //////////////////////////////////////////////////////////////////////
 // There are also some additional variables that control specific
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index 0cea32ed94..51f9b66170 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -121,6 +121,20 @@ $[define] HAVE_MIKMOD 1
 $[undef] HAVE_MIKMOD
 #endif
 
+/* Define if we want to compile the net code.  */
+#if $[HAVE_NET]
+$[define] HAVE_NET 1
+#else
+$[undef] HAVE_NET
+#endif
+
+/* Define if we want to compile the audio code.  */
+#if $[HAVE_AUDIO]
+$[define] HAVE_AUDIO 1
+#else
+$[undef] HAVE_AUDIO
+#endif
+
 /* Define if we have a gettimeofday() function. */
 #if $[HAVE_GETTIMEOFDAY]
 $[define] HAVE_GETTIMEOFDAY 1
diff --git a/dtool/Package.pp b/dtool/Package.pp
index 32ce51b266..6eea02cbf0 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -52,6 +52,8 @@
 #set HAVE_DX $[HAVE_DX]
 #set HAVE_RIB $[HAVE_RIB]
 #set HAVE_MIKMOD $[HAVE_MIKMOD]
+#set HAVE_NET $[HAVE_NET]
+#set HAVE_AUDIO $[HAVE_AUDIO]
 #set HAVE_GTKMM $[HAVE_GTKMM]
 #set HAVE_MAYA $[HAVE_MAYA]
 
diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp
index 681e890807..ad9e35f150 100644
--- a/panda/src/audio/Sources.pp
+++ b/panda/src/audio/Sources.pp
@@ -1,4 +1,5 @@
 #define OTHER_LIBS dtool
+#define DIRECTORY_IF_AUDIO yes
 
 #begin lib_target
   #define USE_AUDIO yes
diff --git a/panda/src/audiotraits/Sources.pp b/panda/src/audiotraits/Sources.pp
index af53472ff9..74494a756b 100644
--- a/panda/src/audiotraits/Sources.pp
+++ b/panda/src/audiotraits/Sources.pp
@@ -1,4 +1,5 @@
 #define OTHER_LIBS dtool
+#define DIRECTORY_IF_AUDIO yes
 
 #begin lib_target
   #define TARGET audio_load_midi
diff --git a/panda/src/net/Sources.pp b/panda/src/net/Sources.pp
index 6b79e408df..2ef388fbdd 100644
--- a/panda/src/net/Sources.pp
+++ b/panda/src/net/Sources.pp
@@ -1,4 +1,6 @@
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m
+#define DIRECTORY_IF_NET yes
+#define USE_NET yes
 
 #begin lib_target
   #define TARGET net