Decoupled ASSERT and DEBUG options.

diff --git a/src/Makefile.global b/src/Makefile.global
index 56f3a03fc613d7048350d67d77843c596c8f6fc7..99d46283cdeaaf13d26795bcf245204d02666ac9 100644 (file)
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -1,4 +1,3 @@
-X=$(shell sleep 4)
 #----------------------------------------------------------------------------
 #
 # Makefile.global--
@@ -8,7 +7,7 @@ X=$(shell sleep 4)
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.46 1996/11/01 02:21:15 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.47 1996/11/01 02:32:16 momjian Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -144,18 +143,19 @@ OIDNAMELEN = 36
 
 #HAVE_Cplusplus= true
 
-# Comment out CDEBUG to turn off debugging and sanity-checking.
+# Set CDEBUG to -O for optimization, or -g for debuggable binaries
 #
-#      XXX on MIPS, use -g3 if you want to compile with -O
 CDEBUG= -O
 
+# Commenting out CASSERT will make things go a LOT faster, but you will
+# also lose a lot of useful error-checking.
+CASSERT= true
+
 # Comment out ENFORCE_ALIGNMENT if you do NOT want unaligned access to
 # multi-byte types to generate a bus error.
 ENFORCE_ALIGNMENT= true
 
-#
-#      XXX define on MIPS if you want to be able to use pixie.
-#          note that this disables dynamic loading!
+# Comment out PROFILE to generate a profile version of the binaries
 #PROFILE= -p -non_shared
 
 # About the use of readline in psql:
@@ -869,16 +869,15 @@ else
       CFLAGS_OPT= -O
    endif
    CFLAGS+= $(CFLAGS_OPT)
-#
-# Uncommenting this will make things go a LOT faster, but you will
-# also lose a lot of useful error-checking.
-#
+endif
+
+ifndef CASSERT
    CFLAGS+= -DNO_ASSERT_CHECKING
 endif
 
 ifdef PROFILE
-CFLAGS+= $(PROFILE)
-LDFLAGS+= $(PROFILE)
+   CFLAGS+= $(PROFILE)
+   LDFLAGS+= $(PROFILE)
 endif
 
 # Globally pass PORTNAME