diff options
| author | unknown <tomas@mc05.(none)> | 2004-06-01 18:05:43 +0200 |
|---|---|---|
| committer | unknown <tomas@mc05.(none)> | 2004-06-01 18:05:43 +0200 |
| commit | c91972c29a5c41f6030e4b27ab72213919934de6 (patch) | |
| tree | d7d574a2d3e6c689a5107360884bfd5950eaec45 /configure.in | |
| parent | cfb496aed8679f2763b3d64655e7b744b9e48793 (diff) | |
| parent | 389e8bec492a5cf1a8cd8bb54f8d14518aaa925a (diff) | |
| download | mariadb-git-c91972c29a5c41f6030e4b27ab72213919934de6.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index b1234721354..8c91a367679 100644 --- a/configure.in +++ b/configure.in @@ -95,7 +95,6 @@ AC_SUBST(CXXLDFLAGS) AC_PREREQ(2.12)dnl Minimum Autoconf version required. -AM_MAINTAINER_MODE #AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE AM_SANITY_CHECK # This is needed is SUBDIRS is set @@ -2663,6 +2662,7 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") # Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR +ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'" if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" then |