diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-28 20:05:04 +0000 |
| commit | b810c1bfd908647f0d01aa54be2e1982a41ba791 (patch) | |
| tree | cfb8488560a5012f8914a2dec14ea7e5240e7823 /configure.ac | |
| parent | 2e60b5456c33b7927a2fda8f5eb5ee08231e3867 (diff) | |
Merged revisions 214696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r214696 | kpfleming | 2009-08-28 15:01:21 -0500 (Fri, 28 Aug 2009) | 9 lines
Ensure that CFLAGS and/or LDFLAGS provided to configure script are preserved.
Cross-compilation environments want to provide 'defaults' for compiler and
linker options, and frequently do this by specifying CFLAGS and LDFLAGS in the
environment or as command-line arguments to the configure script. This patch
modifies the configure script and Makefile to preserve these settings and
ensure they are used in the build process.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@214699 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f90c08762..b574eb360 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,12 @@ AC_REVISION($Revision$) AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD +# preserve any CFLAGS or LDFLAGS that may be set +CONFIG_CFLAGS="${CFLAGS}" +CONFIG_LDFLAGS="${LDFLAGS}" +AC_SUBST(CONFIG_CFLAGS) +AC_SUBST(CONFIG_LDFLAGS) + case "${host_os}" in freebsd*) ac_default_prefix=/usr/local |