diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-08 16:38:42 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-08 16:38:42 +0000 |
commit | c77aa48c723bd3316ca8e0100900f6ad738f0886 (patch) | |
tree | 1089e46e4de6a409e03e85d91756ec704c452593 /configure.ac | |
parent | e1bcb5e4c926a16aca3aff18efb2a474512065ae (diff) |
Merged revisions 217074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r217074 | kpfleming | 2009-09-08 11:37:28 -0500 (Tue, 08 Sep 2009) | 9 lines
Ensure that the default autoconf CFLAGS are not used.
A recent change to the configure script that allows the user to specify
CFLAGS and/or LDFLAGS to the script had the unfortunate side effect of
letting autoconf's default CFLAGS (-g -O2) feed in to the rest of the build
system, thereby overriding the DONT_OPTIMIZE setting in menuselect. That
problem is now corrected.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217075 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e37b34e62..1c8fded08 100644 --- a/configure.ac +++ b/configure.ac @@ -17,20 +17,26 @@ AC_CANONICAL_HOST # check existence of the package AC_CONFIG_SRCDIR([main/asterisk.c]) -# specify output header file -AC_CONFIG_HEADER(include/asterisk/autoconfig.h) - AC_COPYRIGHT("Asterisk") AC_REVISION($Revision$) -AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD - # preserve any CFLAGS or LDFLAGS that may be set +# NOTE: This must be done before calling any macros that end up +# calling AC_PROG_CC or the like, since they will set a default +# set of CFLAGS ("-g -O2") if the user did not supply any, and +# we don't want those default flags to be carried over into the +# rest of the build system since we have other means of controlling +# debugging symbol generation and optimization. CONFIG_CFLAGS="${CFLAGS}" CONFIG_LDFLAGS="${LDFLAGS}" AC_SUBST(CONFIG_CFLAGS) AC_SUBST(CONFIG_LDFLAGS) +# specify output header file +AC_CONFIG_HEADER(include/asterisk/autoconfig.h) + +AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD + case "${host_os}" in freebsd*) ac_default_prefix=/usr/local |