diff --git a/acinclude.m4 b/acinclude.m4
index 39a94d4312..8f309c7614 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,8 +6,6 @@ dnl parameters must be done like $[]1 instead of $1
 
 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
 
-dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
-AS_IF([test -z "$CFLAGS"], [CFLAGS=" "])
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 
diff --git a/src/cf/cc.m4 b/src/cf/cc.m4
index e5edc09f0e..89f40df706 100644
--- a/src/cf/cc.m4
+++ b/src/cf/cc.m4
@@ -26,6 +26,9 @@ AC_DEFUN([OPENAFS_PATH_CC], [
   AC_PROVIDE_IFELSE([AC_PROG_CC],
    [AC_FATAL([AC_PROG_CC was called before $0])])
 
+  dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
+  AS_IF([test -z "$CFLAGS"], [CFLAGS=" "])
+
   AS_CASE([$host],
    dnl hp_ux102
    [hppa*-hp-hpux10*],