ChangeLogTag:Sun Mar 04 03:12:17 2001 Nanbor Wang <nanbor@cs.wustl.edu>

9 files changed, 100 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b7ef92ed5e..39872a213cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
+	  typed in as ACE_STATIC_LIBS.
+
+	* ace/svc_export.h:
+	* ace/RMCast/RMCast_Export.h:
+	* ace/SSL/SSL_Export.h:
+	* websvcs/lib/websvcs_export.h: These files didn't check for
+	  ACE_AS_STATIC_LIBS to determine if they should define their
+	  export macros for static build.  Thanks to Chris Kohlhoff
+	  <chris@kohlhoff.com> for reporting this.       [Bug 813]
+
 Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* ace/QoS/QoS_Session_Impl.cpp:
@@ -134,18 +147,18 @@ Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
 
 Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/ MEM_Acceptor.cpp:
-	* ace/ MEM_Acceptor.h:
-	* ace/ MEM_Addr.cpp:
-	* ace/ MEM_Addr.h:
-	* ace/ MEM_Connector.cpp:
-	* ace/ MEM_Connector.h:
-	* ace/ MEM_IO.cpp:
-	* ace/ MEM_IO.h:
-	* ace/ MEM_SAP.cpp:
-	* ace/ MEM_SAP.h:
-	* ace/ MEM_Stream.cpp:
-	* ace/ MEM_Stream.h: Disabled MEM_Stream support if one chooses
+	* ace/MEM_Acceptor.cpp:
+	* ace/MEM_Acceptor.h:
+	* ace/MEM_Addr.cpp:
+	* ace/MEM_Addr.h:
+	* ace/MEM_Connector.cpp:
+	* ace/MEM_Connector.h:
+	* ace/MEM_IO.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_SAP.cpp:
+	* ace/MEM_SAP.h:
+	* ace/MEM_Stream.cpp:
+	* ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
 	  not to support position independent pointers.
 
 Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5b7ef92ed5e..39872a213cd 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
+	  typed in as ACE_STATIC_LIBS.
+
+	* ace/svc_export.h:
+	* ace/RMCast/RMCast_Export.h:
+	* ace/SSL/SSL_Export.h:
+	* websvcs/lib/websvcs_export.h: These files didn't check for
+	  ACE_AS_STATIC_LIBS to determine if they should define their
+	  export macros for static build.  Thanks to Chris Kohlhoff
+	  <chris@kohlhoff.com> for reporting this.       [Bug 813]
+
 Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* ace/QoS/QoS_Session_Impl.cpp:
@@ -134,18 +147,18 @@ Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
 
 Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/ MEM_Acceptor.cpp:
-	* ace/ MEM_Acceptor.h:
-	* ace/ MEM_Addr.cpp:
-	* ace/ MEM_Addr.h:
-	* ace/ MEM_Connector.cpp:
-	* ace/ MEM_Connector.h:
-	* ace/ MEM_IO.cpp:
-	* ace/ MEM_IO.h:
-	* ace/ MEM_SAP.cpp:
-	* ace/ MEM_SAP.h:
-	* ace/ MEM_Stream.cpp:
-	* ace/ MEM_Stream.h: Disabled MEM_Stream support if one chooses
+	* ace/MEM_Acceptor.cpp:
+	* ace/MEM_Acceptor.h:
+	* ace/MEM_Addr.cpp:
+	* ace/MEM_Addr.h:
+	* ace/MEM_Connector.cpp:
+	* ace/MEM_Connector.h:
+	* ace/MEM_IO.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_SAP.cpp:
+	* ace/MEM_SAP.h:
+	* ace/MEM_Stream.cpp:
+	* ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
 	  not to support position independent pointers.
 
 Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5b7ef92ed5e..39872a213cd 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
+	  typed in as ACE_STATIC_LIBS.
+
+	* ace/svc_export.h:
+	* ace/RMCast/RMCast_Export.h:
+	* ace/SSL/SSL_Export.h:
+	* websvcs/lib/websvcs_export.h: These files didn't check for
+	  ACE_AS_STATIC_LIBS to determine if they should define their
+	  export macros for static build.  Thanks to Chris Kohlhoff
+	  <chris@kohlhoff.com> for reporting this.       [Bug 813]
+
 Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* ace/QoS/QoS_Session_Impl.cpp:
@@ -134,18 +147,18 @@ Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
 
 Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/ MEM_Acceptor.cpp:
-	* ace/ MEM_Acceptor.h:
-	* ace/ MEM_Addr.cpp:
-	* ace/ MEM_Addr.h:
-	* ace/ MEM_Connector.cpp:
-	* ace/ MEM_Connector.h:
-	* ace/ MEM_IO.cpp:
-	* ace/ MEM_IO.h:
-	* ace/ MEM_SAP.cpp:
-	* ace/ MEM_SAP.h:
-	* ace/ MEM_Stream.cpp:
-	* ace/ MEM_Stream.h: Disabled MEM_Stream support if one chooses
+	* ace/MEM_Acceptor.cpp:
+	* ace/MEM_Acceptor.h:
+	* ace/MEM_Addr.cpp:
+	* ace/MEM_Addr.h:
+	* ace/MEM_Connector.cpp:
+	* ace/MEM_Connector.h:
+	* ace/MEM_IO.cpp:
+	* ace/MEM_IO.h:
+	* ace/MEM_SAP.cpp:
+	* ace/MEM_SAP.h:
+	* ace/MEM_Stream.cpp:
+	* ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
 	  not to support position independent pointers.
 
 Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
diff --git a/ace/RMCast/RMCast_Export.h b/ace/RMCast/RMCast_Export.h
index 665d4ecf229..51257c4d682 100644
--- a/ace/RMCast/RMCast_Export.h
+++ b/ace/RMCast/RMCast_Export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
+#  define ACE_RMCAST_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
+
 #if !defined (ACE_RMCAST_HAS_DLL)
 #define ACE_RMCAST_HAS_DLL 1
 #endif /* ! ACE_RMCAST_HAS_DLL */
diff --git a/ace/SSL/SSL_Export.h b/ace/SSL/SSL_Export.h
index 3adaae9798a..ec478095d18 100644
--- a/ace/SSL/SSL_Export.h
+++ b/ace/SSL/SSL_Export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SSL_HAS_DLL)
+#  define ACE_SSL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_SSL_HAS_DLL */
+
 #if !defined (ACE_SSL_HAS_DLL)
 #define ACE_SSL_HAS_DLL 1
 #endif /* ! ACE_SSL_HAS_DLL */
diff --git a/ace/svc_export.h b/ace/svc_export.h
index 0b5ca323c56..f2f320bbc9e 100644
--- a/ace/svc_export.h
+++ b/ace/svc_export.h
@@ -13,6 +13,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SVC_HAS_DLL)
+#  define ACE_SVC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_SVC_HAS_DLL */
+
 #if !defined (ACE_SVC_HAS_DLL)
 #define ACE_SVC_HAS_DLL 1
 #endif /* ! ACE_SVC_HAS_DLL */
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index f5bcaf08ba6..54567889de7 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -18,12 +18,12 @@ if (!getopts ('df:hs') || $opt_h) {
     print "\n";
     print "    -d         Turn on debug mode\n";
     print "    -f         Adds a dependency to another *_HAS_DLL macro\n";
-    print "    -s         Add in ACE_STATIC_LIBS check\n";
+    print "    -s         Add in ACE_AS_STATIC_LIBS check\n";
     print "\n";
     print "generate_export_file creates the *_export files that are used\n";
     print "in exporting of symbols for DLLs (and not exporting them when\n";
     print "the library is static).  If library_name is something like\n";
-    print "\"Foo\", then the file will contain definitions for Foo_Export\n"; 
+    print "\"Foo\", then the file will contain definitions for Foo_Export\n";
     print "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n";
     print "FOO_HAS_DLL, etc.\n";
     exit (1);
@@ -37,7 +37,7 @@ if (defined $opt_d) {
     }
 
     if (defined $opt_s) {
-        print "ACE_STATIC_LIBS turned on\n"; 
+        print "ACE_AS_STATIC_LIBS turned on\n";
     }
 }
 
@@ -72,9 +72,9 @@ $prologue = '
 if (defined $opt_s)
 {
     $static_stuff = "
-#if defined (ACE_STATIC_LIBS) && !defined (-UC-_HAS_DLL)
+#if defined (ACE_AS_STATIC_LIBS) && !defined (-UC-_HAS_DLL)
 #  define -UC-_HAS_DLL 0
-#endif /* ACE_STATIC_LIBS && -UC-_HAS_DLL */
+#endif /* ACE_AS_STATIC_LIBS && -UC-_HAS_DLL */
 ";
 }
 
diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h
index 665d4ecf229..51257c4d682 100644
--- a/protocols/ace/RMCast/RMCast_Export.h
+++ b/protocols/ace/RMCast/RMCast_Export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
+#  define ACE_RMCAST_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
+
 #if !defined (ACE_RMCAST_HAS_DLL)
 #define ACE_RMCAST_HAS_DLL 1
 #endif /* ! ACE_RMCAST_HAS_DLL */
diff --git a/websvcs/lib/websvcs_export.h b/websvcs/lib/websvcs_export.h
index 0f8a8b3f76f..5fe3d7652d5 100644
--- a/websvcs/lib/websvcs_export.h
+++ b/websvcs/lib/websvcs_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_WEBSVCS_HAS_DLL)
+#  define ACE_WEBSVCS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_WEBSVCS_HAS_DLL */
+
 #if !defined (ACE_WEBSVCS_HAS_DLL)
 #define ACE_WEBSVCS_HAS_DLL 1
 #endif /* ! ACE_WEBSVCS_HAS_DLL */