From 7c6441d435982fd6ff8370b55e02e5fe39aefa61 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 4 Oct 2010 13:45:53 +0100 Subject: [PATCH] configure: Don't let autoconf pick our CFLAGS If the user hasn't specified CFLAGS on the command line to ./configure, then autoconf will set them to -g -O2 if the compiler supports those options. For compatibility with what OpenAFS has always done, and to let us manually set optimisation and debugging flags later, disable this behaviour. Reviewed-on: http://gerrit.openafs.org/2895 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit b1f747c1f131fc1a9f8a5895fb06607a255a27d8) Change-Id: Id35b288a56c8946a34b234eac1e899898d29ae65 Reviewed-on: http://gerrit.openafs.org/4003 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- configure-libafs.ac | 3 +++ configure.ac | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/configure-libafs.ac b/configure-libafs.ac index 8e8e28afa6..86a2220862 100644 --- a/configure-libafs.ac +++ b/configure-libafs.ac @@ -14,7 +14,10 @@ AC_SUBST(MACOS_VERSION) AC_SUBST(LINUX_PKGVER) AC_SUBST(LINUX_PKGREL) +dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2 +AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], []) AC_PROG_CC + OPENAFS_CONFIGURE_COMMON AC_OUTPUT( \ diff --git a/configure.ac b/configure.ac index ec597a4bec..aa8e359187 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,11 @@ AC_SUBST(LINUX_PKGREL) AC_SUBST(DEB_PKGVER) AC_USE_SYSTEM_EXTENSIONS + +dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2 +AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], []) AC_PROG_CC + AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib]) AC_SUBST([PATH_CPP]) OPENAFS_CONFIGURE_COMMON