support to allow --with-ccopts=

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3884 dc483132-0cff-0310-8789-dd5450dbe970

110 files changed, 110 insertions, 0 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index ece2de71b..49b057a74 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/admin/Makefile.in b/src/admin/Makefile.in
index 246cb6b57..3213c3a95 100644
--- a/src/admin/Makefile.in
+++ b/src/admin/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index 8a163fdab..d9b0df4f2 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in
index f653b472c..5b63212bf 100644
--- a/src/admin/aname/configure.in
+++ b/src/admin/aname/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_anadd.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/configure.in b/src/admin/configure.in
index 6f1d08324..0dc9b07ec 100644
--- a/src/admin/configure.in
+++ b/src/admin/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_WITH([krb4],convert=convert,convert=)
 CONFIG_DIRS(create destroy edit stash aname $convert)
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 14b2b46c3..2b436f1ad 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 KRB4 = @KRB4@
 
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 13247906b..382f1e706 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_convert.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 516472846..227d7913a 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in
index cfc272109..ae1fa0497 100644
--- a/src/admin/create/configure.in
+++ b/src/admin/create/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_create.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index aed648e4d..e55e06600 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in
index 3e6da1234..bb1c72f12 100644
--- a/src/admin/destroy/configure.in
+++ b/src/admin/destroy/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_destroy.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 251a47cc5..6896bbaf6 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index 954c13acd..7d522928f 100644
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_edit.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 75c3cc05b..f8addb07b 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in
index 83dffc46c..fb1b46b64 100644
--- a/src/admin/stash/configure.in
+++ b/src/admin/stash/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdb5_stash.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 7be88b435..f212f78b2 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/configure.in b/src/appl/configure.in
index 7cdf8fea5..11149d125 100644
--- a/src/appl/configure.in
+++ b/src/appl/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(sample simple user_user)
 MAKE_SUBDIRS("making",all)
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index 7be88b435..f212f78b2 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in
index c1c3fa2b8..3d953e69f 100644
--- a/src/appl/sample/configure.in
+++ b/src/appl/sample/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(sclient sserver)
 MAKE_SUBDIRS("making",all)
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 457ad807d..fbd9d2ccc 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 40a35bff3..8650da601 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sclient.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 928739774..bd5dc2742 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index 03cc40f72..c11045cc9 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sserver.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 7be88b435..f212f78b2 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 25e6a1fcc..4a4e1a068 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index 2b66c22b4..c0a213446 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sim_client.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in
index 26a05ce11..518fea4e4 100644
--- a/src/appl/simple/configure.in
+++ b/src/appl/simple/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(client server)
 MAKE_SUBDIRS("making",all)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 5993ee7cb..9cc7f4315 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index d71cde86e..358f32ddc 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sim_server.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index 1e2315476..a3cdec021 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index da7e0b451..ab9292c04 100644
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(auth.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 KRB_INCLUDE
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index e05042b9b..98b6e8e25 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index 808ded1bc..848177312 100644
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(client.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index 7be88b435..f212f78b2 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/clients/configure.in b/src/clients/configure.in
index cdd632054..7be2a3255 100644
--- a/src/clients/configure.in
+++ b/src/clients/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(klist kinit kdestroy)
 MAKE_SUBDIRS("making",all)
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index eacc6dd23..9f57d5e95 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index f168750f7..0d725e504 100644
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kdestroy.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 KRB_INCLUDE
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index ad1976f2e..d47f950f7 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index 0c7514635..21a6a7fe6 100644
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kinit.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 2eec62f86..6b280032a 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index c09d5e4f7..491d8832e 100644
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(klist.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 KRB_INCLUDE
diff --git a/src/configure.in b/src/configure.in
index d73a8e6cc..6b7aabe3a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(util include isode lib kdc admin kadmin slave clients appl)
 MAKE_SUBDIRS("making",all)
diff --git a/src/isode/compat/configure.in b/src/isode/compat/configure.in
index b18ba0dd7..292aded52 100644
--- a/src/isode/compat/configure.in
+++ b/src/isode/compat/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_REPLACE_FUNCS(strdup)
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/h/configure.in b/src/isode/h/configure.in
index 1ffff33fd..ed4e5d61d 100644
--- a/src/isode/h/configure.in
+++ b/src/isode/h/configure.in
@@ -1,3 +1,4 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index a3ee9e35b..41459a4de 100644
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -6,6 +6,7 @@ BUILDTOP=@BUILDTOP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 
 TOPDIR = $(BUILDTOP)/
 
diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in
index 56a3b8c2a..9716d25d7 100644
--- a/src/isode/pepsy/configure.in
+++ b/src/isode/pepsy/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_PROG_LEX
 AC_YYTEXT_POINTER
diff --git a/src/isode/psap/configure.in b/src/isode/psap/configure.in
index 191ca7526..55ec65b10 100644
--- a/src/isode/psap/configure.in
+++ b/src/isode/psap/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(nsl)
 AC_HAVE_LIBRARY(socket)
diff --git a/src/isode/support/configure.in b/src/isode/support/configure.in
index 1ffff33fd..ed4e5d61d 100644
--- a/src/isode/support/configure.in
+++ b/src/isode/support/configure.in
@@ -1,3 +1,4 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index fa3f7d8c5..18a170613 100644
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index 36dbf8a6e..4f5ed7ec1 100644
--- a/src/kadmin/client/Makefile.in
+++ b/src/kadmin/client/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in
index 6c2ff6122..7e68827f0 100644
--- a/src/kadmin/client/configure.in
+++ b/src/kadmin/client/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kadmin.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 5b34bf55f..29638d105 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_WITH([krb4],v4server=v4server,v4server=)
 CONFIG_DIRS(client kpasswd server $v4server)
diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index 6078802b3..c6fa9338f 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in
index 078be763f..d1aa83c97 100644
--- a/src/kadmin/kpasswd/configure.in
+++ b/src/kadmin/kpasswd/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kpasswd.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 1d0a5c8a3..c2f071fe9 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 KRB4 = @KRB4@
 K4LIB = @K4LIB@
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 6a93b5d84..3836e4fe2 100644
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(main.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 9c59f7949..68f27503d 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/configure.in b/src/lib/configure.in
index 6171722a8..b2dfabbee 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(krb5 kdb des425 krb425 crypto gssapi)
 AC_PROG_ARCHIVE
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index e53a01cb8..7a541843f 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -8,6 +8,7 @@ ARADD = @ARADD@
 SUBDIRS = @SUBDIRS@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 9f81e7cf2..34d811e29 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(des crc32 md4 md5 os)
 AC_PROG_ARCHIVE
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index c7fcf0c2f..308831bd3 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/crypto/crc32/configure.in
+++ b/src/lib/crypto/crc32/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index e5cecd046..ef795abd2 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 10e676172..b62d2e876 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/crypto/md4/configure.in
+++ b/src/lib/crypto/md4/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index efbbe19ee..bc0ee0c06 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/crypto/md5/configure.in
+++ b/src/lib/crypto/md5/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 6308ae39c..3bcec0617 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in
index 49a6c8228..eeb989d0f 100644
--- a/src/lib/crypto/os/configure.in
+++ b/src/lib/crypto/os/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 4b56b1e7c..477dcac60 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -9,6 +9,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 504b0c78b..02bf6d222 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 7661a52d2..a49dc67de 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index 1f2b56555..9d4dd80fe 100644
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 ET_RULES
 CONFIG_RULES
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index ce164a49c..550c0bca0 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in
index e5f2f6ede..de1d30942 100644
--- a/src/lib/gssapi/krb5/configure.in
+++ b/src/lib/gssapi/krb5/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 ET_RULES
 CONFIG_RULES
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 83eb111fb..f0da7e89c 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -7,6 +7,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index fd132bd5c..767fce245 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index 887e39503..77e6b7bab 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -7,6 +7,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) -I$(SRCTOP)/include/kerberosIV
diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in
index f414b745d..31dd3635a 100644
--- a/src/lib/krb425/configure.in
+++ b/src/lib/krb425/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 ET_RULES
 AC_PROG_ARCHIVE
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 1cf55f100..27b694722 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 # -I. for isode/
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 5dc1c4e95..a26260766 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 UsePepsy
 CONFIG_RULES
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 5e1984c12..605e7b377 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
index aae14229c..7b11d21e4 100644
--- a/src/lib/krb5/ccache/configure.in
+++ b/src/lib/krb5/ccache/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(file stdio)
 AC_PROG_ARCHIVE
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index ce1fc102a..ad0966d66 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index e1846fc12..a9f49d9a9 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/krb5/ccache/stdio/configure.in
+++ b/src/lib/krb5/ccache/stdio/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 496df9dda..b94e93653 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index 0043f2a55..e5b70eecb 100644
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 ET_RULES
 SS_RULES
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 01195b055..d16d8d706 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in
index ceccb7221..9987e9451 100644
--- a/src/lib/krb5/free/configure.in
+++ b/src/lib/krb5/free/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 4e74ab385..720368fe6 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in
index 6e557cb1f..5110ac431 100644
--- a/src/lib/krb5/keytab/configure.in
+++ b/src/lib/krb5/keytab/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(file)
 AC_PROG_ARCHIVE
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index e787e108c..e02a7e897 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in
index cc5e8f0b7..52832f2ac 100644
--- a/src/lib/krb5/keytab/file/configure.in
+++ b/src/lib/krb5/keytab/file/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 71a14747a..0155c9966 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in
index 09b8861b8..12196b324 100644
--- a/src/lib/krb5/krb/configure.in
+++ b/src/lib/krb5/krb/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 44a315191..e66117cd3 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index ceccb7221..9987e9451 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index ad8760f8b..eae840f17 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in
index 42f9f8eba..924997432 100644
--- a/src/lib/krb5/posix/configure.in
+++ b/src/lib/krb5/posix/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index e91c2e6b9..d1a891e4f 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -5,6 +5,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS)
diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in
index ceccb7221..9987e9451 100644
--- a/src/lib/krb5/rcache/configure.in
+++ b/src/lib/krb5/rcache/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index e4f7cd1a0..303ef27e6 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/slave/configure.in b/src/slave/configure.in
index b47fdca82..d21b227c8 100644
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(kprop.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 7be88b435..f212f78b2 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 
 CFLAGS = $(CCOPTS)
diff --git a/src/util/configure.in b/src/util/configure.in
index 4fde8230b..ec5e4d8a6 100644
--- a/src/util/configure.in
+++ b/src/util/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(configure.in)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_DIRS(unifdef et ss)
 MAKE_SUBDIRS("making",all)
diff --git a/src/util/unifdef/Makefile.in b/src/util/unifdef/Makefile.in
index d8eb2d230..ceec832e6 100644
--- a/src/util/unifdef/Makefile.in
+++ b/src/util/unifdef/Makefile.in
@@ -3,6 +3,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
  
 DEFS = @DEFS@
+CCOPTS = @CCOPTS@
 LIBS = @LIBS@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
diff --git a/src/util/unifdef/configure.in b/src/util/unifdef/configure.in
index 0bfc43b25..8d01561c4 100644
--- a/src/util/unifdef/configure.in
+++ b/src/util/unifdef/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(unifdef.c)
+WITH_CCOPTS
 AC_SET_BUILDTOP
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])