Fri Oct 27 12:04:17 2000 Chris Cleeland <cleeland_c@ociweb.com>

13 files changed, 34 insertions, 36 deletions

diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index e7c9b316b49..3f949d50a31 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -6,7 +6,7 @@ CHORUS = 1
 CROSS-COMPILE = 1
 
 debug = 1
-exceptions =
+exceptions = 0
 optimize = 1
 shared_libs =
 static_libs = 1
diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU
index 9365aec27d3..28b22cf9214 100644
--- a/include/makeinclude/platform_chorus4.x_g++.GNU
+++ b/include/makeinclude/platform_chorus4.x_g++.GNU
@@ -25,7 +25,7 @@ CHORUS = 1
 CROSS-COMPILE = 1
 
 debug       = 1
-exceptions  =
+exceptions  = 0
 optimize    = 1
 shared_libs =
 static_libs = 1
diff --git a/include/makeinclude/platform_chorus_ghs.GNU b/include/makeinclude/platform_chorus_ghs.GNU
index 44651bee879..744b28b3d74 100644
--- a/include/makeinclude/platform_chorus_ghs.GNU
+++ b/include/makeinclude/platform_chorus_ghs.GNU
@@ -64,7 +64,7 @@ else
   CRTH = $(MVME_DIR)/lib/crt/crth_d.s.o
 endif # debug
 
-ifdef exceptions
+ifeq (1,$(exceptions))
   CCFLAGS += --exceptions
 endif # exceptions
 
diff --git a/include/makeinclude/platform_cray.GNU b/include/makeinclude/platform_cray.GNU
index a36b6fd3c27..30b63d3a089 100644
--- a/include/makeinclude/platform_cray.GNU
+++ b/include/makeinclude/platform_cray.GNU
@@ -28,11 +28,11 @@ DCCFLAGS        += $(DCFLAGS)
 OCFLAGS         += -O2
 OCCFLAGS        += $(OCFLAGS)
 
-ifndef exceptions
-  CCFLAGS += -h noexceptions
-else
+ifeq (1,$(exceptions))
   CCFLAGS += -h exceptions
-endif # ! exceptions
+else
+  CCFLAGS += -h noexceptions
+endif # exceptions
 
 DLD             = $(CXX)
 LD              = $(CXX)
diff --git a/include/makeinclude/platform_hpux_kcc.GNU b/include/makeinclude/platform_hpux_kcc.GNU
index 6beb76804c4..eb7c11dee0d 100644
--- a/include/makeinclude/platform_hpux_kcc.GNU
+++ b/include/makeinclude/platform_hpux_kcc.GNU
@@ -39,7 +39,7 @@ else
   THR_DEFS   = -DACE_HAS_THREADS=0
   LDFLAGS    =
   ARFLAGS    =
-  ifndef exceptions
+  ifeq (0,$(exceptions))
     CCFLAGS += --no_exceptions
     LDFLAGS += --no_exceptions
   endif
diff --git a/include/makeinclude/platform_linux_cxx.GNU b/include/makeinclude/platform_linux_cxx.GNU
index d1cbdbd1147..52997f3348b 100644
--- a/include/makeinclude/platform_linux_cxx.GNU
+++ b/include/makeinclude/platform_linux_cxx.GNU
@@ -18,7 +18,7 @@ CFLAGS          +=
   endif # VERBOSE_WARNING
 
 CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS)
-ifeq ($(rtti),)
+ifeq ($(rtti),0)
   CCFLAGS += -nortti
 endif # rtti
 DCFLAGS         += -g -O0
@@ -37,7 +37,7 @@ SOFLAGS         = -shared $(ACELIB)
 SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
                   ln $(VSHDIR)$*.o $@
 
-ifndef exceptions
+ifeq (0,$(exceptions))
   #### Disable the default exception handling of cxx >= 6.0.
   #### This is untested.  exceptions=1 is the default, so it's not used
   #### by default.
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index a7735ae3a0f..65b805fa206 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -37,7 +37,7 @@ ifneq ($(CXX_VER),CXX_5)
 endif # 6.0 or later
 
 CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS)
-ifeq ($(rtti),)
+ifeq ($(rtti),0)
   CCFLAGS += -nortti
 endif # rtti
 DCFLAGS         += -g -O0
@@ -60,7 +60,7 @@ LIBS            := $(LIBS) -hidden /usr/lib/cmplrs/cxx/libcxxstd.a -non_hidden
 SOBUILD         = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
                   ln $(VSHDIR)$*.o $@
 
-ifndef exceptions
+ifeq (0,$(exceptions))
   #### Disable the default exception handling of cxx >= 6.0.
   #### This is untested.  exceptions=1 is the default, so it's not used
   #### by default.
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
index 8d285c0d54c..8933d0fc199 100644
--- a/include/makeinclude/platform_sunos5_ghs.GNU
+++ b/include/makeinclude/platform_sunos5_ghs.GNU
@@ -3,7 +3,7 @@
 # SunOS 5.x (Solaris 2.x) with GreenHills compiler.
 
 debug = 1
-exceptions =
+exceptions = 0
 optimize = 1
 threads = 1
 
@@ -31,7 +31,7 @@ else  # ! threads
   CFLAGS += -DACE_MT_SAFE=0
 endif # ! threads
 
-ifdef exceptions
+ifeq (1,$(exceptions))
   CCFLAGS += --exceptions
 else  # ! exceptions
   CCFLAGS += --no_exceptions
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
index f70a81cc93f..037caf94f07 100644
--- a/include/makeinclude/platform_sunos5_kcc.GNU
+++ b/include/makeinclude/platform_sunos5_kcc.GNU
@@ -28,10 +28,8 @@ DCFLAGS         += +K0 -g
 DLD             = $(CXX)
 LD              = $(CXX)
 
-ifdef exceptions
-  ifneq ($exceptions,0)
-    CCFLAGS += --exceptions
-  endif # ! exceptions
+ifeq (1,$(exceptions))
+  CCFLAGS += --exceptions
 else
   CCFLAGS   += --no_exceptions
   LDFLAGS   += --no_exceptions
@@ -104,7 +102,7 @@ endif # BIN
 #### -g is incompatible with -fast.  If you need -g, you can
 #### use "-fast -O3".
 ####
-ifdef fast
+ifeq (1,$(fast))
   CFLAGS += -fast +K3
   DCFLAGS =
   LDFLAGS += -fast +K3
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 72b92af9e1c..2832c4b7b27 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -76,7 +76,7 @@ ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
   #### RTTI can coexist with ACE, but it doesn't use it.  To enable,
   #### add rtti=1 to your make invocation.  Sun C++ 4.2, only, supports
   #### this option.
-  ifdef rtti
+  ifeq (1,$(rtti))
     CCFLAGS += -features=rtti
   else  # ! rtti
     #### ACE_LACKS_RTTI is necessary with -features=castop, but
@@ -126,7 +126,7 @@ DLD             = $(CXX)
 #### performance penalty of exception handling, then use the default
 #### of no exceptions.  If you want to enable exception handling,
 #### add "exceptions=1" to your "make" invocation.
-ifndef exceptions
+ifeq (0,$(exceptions))
   CCFLAGS += -noex
 endif # ! exceptions
 
@@ -196,7 +196,7 @@ endif # BIN
 #### -g is incompatible with -fast.  If you need -g, you can
 #### use "-fast -O3".
 ####
-ifdef fast
+ifeq (1,$(fast))
   CFLAGS += -fast
   DCFLAGS =
   LDFLAGS += -fast
diff --git a/include/makeinclude/platform_vxworks5.x_diab.GNU b/include/makeinclude/platform_vxworks5.x_diab.GNU
index 57225f51926..1f350d844d5 100644
--- a/include/makeinclude/platform_vxworks5.x_diab.GNU
+++ b/include/makeinclude/platform_vxworks5.x_diab.GNU
@@ -24,7 +24,7 @@ ifndef optimize
   optimize = 1
 endif # ! optimize
 ifndef rtti
-  rtti =
+  rtti = 0
 endif # ! rtti
 
 shared_libs =
@@ -129,7 +129,7 @@ CXX             = $(CC)
 CFLAGS          += -Xsmall-data=0 -Xsmall-const=0 -Xno-implicit-templates \
                    -Xstrings-in-text=0 -tPPC750EN:tornado
 CCFLAGS         += $(CFLAGS) -Xenum-is-int -Xbool-is-int
-ifeq (,$(rtti))
+ifeq (0,$(rtti))
   #### Don't use RTTI, because Tornado 1.0.x libraries don't support it.
   CCFLAGS += -DACE_LACKS_RTTI
 endif # rtti
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 41b83046043..9118ecf4229 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -25,7 +25,7 @@ ifndef optimize
   optimize = 1
 endif # ! optimize
 ifndef rtti
-  rtti =
+  rtti = 0
 endif # ! rtti
 
 shared_libs =
@@ -229,7 +229,7 @@ endif # egcs
 CFLAGS          += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
                    -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -W -Wall
 CCFLAGS         += $(CFLAGS)
-ifeq (,$(rtti))
+ifeq (0,$(rtti))
   #### Don't use RTTI even with egcs, because Tornado 1.0.x libraries
   #### don't support it.
   CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index c859f8054f0..81782ea213a 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -146,17 +146,17 @@ endif # static_libs
 
 #### Let platform just look at whether or not exceptions is defined.
 #### With the following override, it doesn't have to check for 0.
-ifeq ($(exceptions),0)
-  override exceptions =
-endif # exceptions
+#ifeq ($(exceptions),0)
+#  override exceptions =
+#endif # exceptions
 
-ifeq ($(fast),0)
-  override fast =
-endif # fast
+#ifeq ($(fast),0)
+#  override fast =
+#endif # fast
 
-ifeq ($(rtti),0)
-  override rtti =
-endif # rtti
+#ifeq ($(rtti),0)
+#  override rtti =
+#endif # rtti
 
 #### Defined versioned_so = 1 if your platform requires version number
 #### be appended after so library.
@@ -409,7 +409,7 @@ ifneq ($(ssl),)
   LDFLAGS += $(PLATFORM_SSL_LDFLAGS)
 endif # ssl
 
-ifeq ($(exceptions),)
+ifeq ($(exceptions),0)
   ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
     #### Disable the default exception handling of g++ >= 2.8.0.
     ifneq ($(ACE_GNUG_ON_UNIXWARE),)