Move -Werror to a variable (WARNERR). Comment it out for now in response

to new GCC 4.0.0 warnings we haven't yet witnessed (but have reports of).

diff --git a/Makefile.conf b/Makefile.conf
index 6d90e4ffddbceb631984f391ffcc6f309922af48..acdfb5818ece0d8aa1c00bd8e0b2326eaaa29da4 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -47,6 +47,7 @@ INCDIR=/usr/local/include
 LIBS =
 COPTS = $(BINDDEF) $(CC_OPTIONS)
 DEBUG = -g
+#WARNERR = -Werror
 RANLIB = ranlib
 MKDEP = mkdep
 CLIENT_PATH = '"PATH=/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"'
@@ -127,7 +128,7 @@ MINORVERSION=MinorVersion
 #LIBS = -lresolv -lsocket -lnsl -lgen
 #CC=gcc
 #COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#       -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror \
+#       -Wno-uninitialized -Wno-char-subscripts -Wno-switch $(WARNERR) \
 #       -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
 #       $(CC_OPTIONS)
 #CF = cf/sunos5-5.h
@@ -203,7 +204,7 @@ MINORVERSION=MinorVersion
 ## FreeBSD
 ##--freebsd--
 #CF = cf/freebsd.h
-#COPTS = -O -Wall -Wno-unused -Werror $(CC_OPTIONS)
+#COPTS = -O -Wall -Wno-unused $(WARNERR) $(CC_OPTIONS)
 #SCRIPT=freebsd
 ##--freebsd--
 
@@ -211,7 +212,7 @@ MINORVERSION=MinorVersion
 ##--rhapsody--
 #CF = cf/rhapsody.h
 #COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#        -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+#        -Wno-uninitialized -Wno-switch $(WARNERR) -pipe $(BINDDEF) $(CC_OPTIONS)
 ##SCRIPT=rhapsody
 ##--rhapsody--
 
@@ -219,7 +220,7 @@ MINORVERSION=MinorVersion
 ##--darwin--
 #CF = cf/rhapsody.h
 #COPTS  = -Ddarwin -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#        -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+#        -Wno-uninitialized -Wno-switch $(WARNERR) -pipe $(BINDDEF) $(CC_OPTIONS)
 #SCRIPT=freebsd
 ##--darwin--
 
@@ -227,7 +228,7 @@ MINORVERSION=MinorVersion
 ##--netbsd--
 #CF = cf/netbsd.h
 #COPTS  = -Wall -Wstrict-prototypes -Wno-unused -Wno-comment \
-#        -Wno-uninitialized -Werror \
+#        -Wno-uninitialized $(WARNERR) \
 #        -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
 #        -Wwrite-strings -Wmissing-prototypes \
 #        -Wmissing-declarations -Wnested-externs \