ChangeLogTag:Tue Oct 10 16:34:01 2000 Nanbor Wang <nanbor@cs.wustl.edu>

10 files changed, 99 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 19519cd502e..a5fda4c5ab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Tue Oct 10 16:34:01 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/config-win32-common.h: Changed ACE_HAS_SVC_DLL to
+	  ACE_SVC_HAS_DLL and commented out its definition.  The default
+	  definition of ACE_SVC_HAS_DLL has been moved to
+	  ace/Svc_export.h.  The comment-out code here only serves as a
+	  reminder to users.  Thanks to McCurry <mccurry@my-deja.com> for
+	  pointing this out.
+
+	* netsvcs/lib/Base_Optimizer.cpp:  Removed redundant definition of
+	  ACE_BUILD_DLL.
+
+	* ace/ACE_export.h:
+	* ace/OS_Export.h:
+	  Added a new macro ACE_AS_STATIC_LIBS that controls the default
+	  value of ACE_OS_HAS_DLL and ACE_HAS_DLL so we can build static
+	  ACE library easily.
+
+	* ace/ace_lib.dsp:
+	* apps/gperf/src/gperf.dsp:
+	* apps/gperf/src/gperf_lib.dsp:  Changed to use ACE_AS_STATIC_LIBS
+	  for static configurations.
+
 Mon Oct 09 16:45:00 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/Makefile:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 19519cd502e..a5fda4c5ab4 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,26 @@
+Tue Oct 10 16:34:01 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/config-win32-common.h: Changed ACE_HAS_SVC_DLL to
+	  ACE_SVC_HAS_DLL and commented out its definition.  The default
+	  definition of ACE_SVC_HAS_DLL has been moved to
+	  ace/Svc_export.h.  The comment-out code here only serves as a
+	  reminder to users.  Thanks to McCurry <mccurry@my-deja.com> for
+	  pointing this out.
+
+	* netsvcs/lib/Base_Optimizer.cpp:  Removed redundant definition of
+	  ACE_BUILD_DLL.
+
+	* ace/ACE_export.h:
+	* ace/OS_Export.h:
+	  Added a new macro ACE_AS_STATIC_LIBS that controls the default
+	  value of ACE_OS_HAS_DLL and ACE_HAS_DLL so we can build static
+	  ACE library easily.
+
+	* ace/ace_lib.dsp:
+	* apps/gperf/src/gperf.dsp:
+	* apps/gperf/src/gperf_lib.dsp:  Changed to use ACE_AS_STATIC_LIBS
+	  for static configurations.
+
 Mon Oct 09 16:45:00 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/Makefile:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 19519cd502e..a5fda4c5ab4 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,26 @@
+Tue Oct 10 16:34:01 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/config-win32-common.h: Changed ACE_HAS_SVC_DLL to
+	  ACE_SVC_HAS_DLL and commented out its definition.  The default
+	  definition of ACE_SVC_HAS_DLL has been moved to
+	  ace/Svc_export.h.  The comment-out code here only serves as a
+	  reminder to users.  Thanks to McCurry <mccurry@my-deja.com> for
+	  pointing this out.
+
+	* netsvcs/lib/Base_Optimizer.cpp:  Removed redundant definition of
+	  ACE_BUILD_DLL.
+
+	* ace/ACE_export.h:
+	* ace/OS_Export.h:
+	  Added a new macro ACE_AS_STATIC_LIBS that controls the default
+	  value of ACE_OS_HAS_DLL and ACE_HAS_DLL so we can build static
+	  ACE library easily.
+
+	* ace/ace_lib.dsp:
+	* apps/gperf/src/gperf.dsp:
+	* apps/gperf/src/gperf_lib.dsp:  Changed to use ACE_AS_STATIC_LIBS
+	  for static configurations.
+
 Mon Oct 09 16:45:00 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/RMCast/Makefile:
diff --git a/ace/ACE_export.h b/ace/ACE_export.h
index e9c388c793f..9783eab8fc9 100644
--- a/ace/ACE_export.h
+++ b/ace/ACE_export.h
@@ -9,9 +9,15 @@
 
 #include "ace/config-all.h"
 
-#if !defined (ACE_HAS_DLL)
-#define ACE_HAS_DLL 1
-#endif /* ! ACE_HAS_DLL */
+#if defined (ACE_AS_STATIC_LIBS)
+# if !defined (ACE_HAS_DLL)
+#   define ACE_HAS_DLL 0
+# endif /* ! ACE_HAS_DLL */
+#else
+# if !defined (ACE_HAS_DLL)
+#   define ACE_HAS_DLL 1
+# endif /* ! ACE_HAS_DLL */
+#endif /* ACE_AS_STATIC_LIB */
 
 #if defined (ACE_HAS_DLL)
 #  if (ACE_HAS_DLL == 1)
diff --git a/ace/OS_Export.h b/ace/OS_Export.h
index 989d6c69fe9..bc6841996c8 100644
--- a/ace/OS_Export.h
+++ b/ace/OS_Export.h
@@ -9,9 +9,15 @@
 
 #include "ace/config-all.h"
 
-#if !defined (ACE_OS_HAS_DLL)
-#define ACE_OS_HAS_DLL 1
-#endif /* ! ACE_OS_HAS_DLL */
+#if defined (ACE_AS_STATIC_LIBS)
+# if !defined (ACE_OS_HAS_DLL)
+#   define ACE_OS_HAS_DLL 0
+# endif /* ! ACE_OS_HAS_DLL */
+#else
+# if !defined (ACE_OS_HAS_DLL)
+#   define ACE_OS_HAS_DLL 1
+# endif /* ! ACE_OS_HAS_DLL */
+#endif /* ACE_AS_STATIC_LIB */
 
 #if defined (ACE_OS_HAS_DLL)
 #  if (ACE_OS_HAS_DLL == 1)
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 247a4ff8e29..8db120767dd 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -143,7 +143,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -169,7 +169,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D ACE_OS_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 89244889acc..8f4d2b7a3bf 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -68,23 +68,15 @@
 # define ACE_MT_SAFE 1
 #endif
 
-// Build as as a DLL.  Define ACE_HAS_DLL to 0 if you want to build a static
-// lib.
-//  Setting applies to  : building ACE, linking with ACE
-//  Runtime restrictions: ACE DLL must be installed :-)
-#if !defined (ACE_HAS_DLL)
-# define ACE_HAS_DLL 1
-#endif
-
 // Build ACE services as DLLs.  If you write a library and want it to
 // use ACE_Svc_Export, this will cause those macros to build dlls.  If
 // you want your ACE service to be a static library, comment out this
 // line.  As far as I know, the only reason to have a library be an
 // ACE "service" is to leverage the ACE_Svc_Export macros.  It's just
 // as easy to define your own export macros.
-#if !defined (ACE_HAS_SVC_DLL)
-# define ACE_HAS_SVC_DLL 1
-#endif
+//  #if !defined (ACE_SVC_HAS_DLL)
+//  # define ACE_SVC_HAS_DLL 1
+//  #endif
 
 // Define the special export macros needed to export symbols outside a dll
 #define ACE_HAS_CUSTOM_EXPORT_MACROS
@@ -239,7 +231,7 @@ typedef unsigned __int64 ACE_UINT64;
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 // Win32 has wchar_t support
-#define ACE_HAS_WCHAR 
+#define ACE_HAS_WCHAR
 
 // Compiler/platform correctly calls init()/fini() for shared
 // libraries. - applied for DLLs ?
@@ -339,8 +331,8 @@ typedef unsigned __int64 ACE_UINT64;
 // must have _MT defined to include multithreading
 // features from win32 headers
 # if !defined(_MT) && !defined (ACE_HAS_WINCE)
-// *** DO NOT *** defeat this error message by defining _MT yourself.  
-// On MSVC, this is changed by selecting the Multithreaded 
+// *** DO NOT *** defeat this error message by defining _MT yourself.
+// On MSVC, this is changed by selecting the Multithreaded
 // DLL or Debug Multithreaded DLL in the Project Settings
 // under C++ Code Generation.
 #  error You must link against multi-threaded libraries when using ACE (check your project settings)
diff --git a/apps/gperf/src/gperf.dsp b/apps/gperf/src/gperf.dsp
index b3ee09e8c41..308e5de129c 100644
--- a/apps/gperf/src/gperf.dsp
+++ b/apps/gperf/src/gperf.dsp
@@ -166,7 +166,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -197,7 +197,7 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/apps/gperf/src/gperf_lib.dsp b/apps/gperf/src/gperf_lib.dsp
index ead16058f41..5ced2735a76 100644
--- a/apps/gperf/src/gperf_lib.dsp
+++ b/apps/gperf/src/gperf_lib.dsp
@@ -146,7 +146,7 @@ LIB32=link.exe -lib
 CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -173,7 +173,7 @@ LIB32=link.exe -lib
 CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

diff --git a/netsvcs/lib/Base_Optimizer.cpp b/netsvcs/lib/Base_Optimizer.cpp
index bb8d032358e..3cf3754c212 100644
--- a/netsvcs/lib/Base_Optimizer.cpp
+++ b/netsvcs/lib/Base_Optimizer.cpp
@@ -3,8 +3,6 @@
 #if !defined (BASE_OPTIMIZER_CPP)
 #define BASE_OPTIMIZER_CPP
 
-#define ACE_BUILD_DLL
-
 #include "Base_Optimizer.h"
 
 ACE_RCSID(lib, Base_Optimizer, "$Id$")