diff options
| author | unknown <joerg@trift2.> | 2007-10-19 19:19:15 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-10-19 19:19:15 +0200 |
| commit | f3eed850c75261562361dae6b616af30a5fa6906 (patch) | |
| tree | 4d0817aaf1db6cd5a0b990a3b6705696b168cbde /scripts/Makefile.am | |
| parent | b85e1046dd7a1615f657428b4037af2a297781f0 (diff) | |
| parent | a9624698be3d1aca47454fb9a5060c637e6b1d66 (diff) | |
| download | mariadb-git-f3eed850c75261562361dae6b616af30a5fa6906.tar.gz | |
Merge trift2.:/MySQL/M50/bug31644-5.0
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 182076b32b6..5db5fdd550f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -149,13 +149,19 @@ SUFFIXES = .sh -e 's!@''CC''@!@CC@!'\ -e 's!@''CXX''@!@CXX@!'\ -e 's!@''GXX''@!@GXX@!'\ + -e 's!@''SAVE_CC''@!@SAVE_CC@!'\ + -e 's!@''SAVE_CXX''@!@SAVE_CXX@!'\ -e 's!@''CC_VERSION''@!@CC_VERSION@!'\ -e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\ -e 's!@''PERL''@!@PERL@!' \ - -e 's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'\ - -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\ - -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ - -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'\ + -e 's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'\ + -e 's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ + -e 's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''ASFLAGS''@!@ASFLAGS@!'\ + -e 's!@''CFLAGS''@!@CFLAGS@!'\ + -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\ + -e 's!@''LDFLAGS''@!@LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ |