diff options
| author | unknown <joreland@mysql.com> | 2004-09-06 07:43:31 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-06 07:43:31 +0200 |
| commit | fd07116e2f705ab5e54b614eba9f32cf10b8b0f1 (patch) | |
| tree | 4fdc68458808d0f58a5d559e3c181b8b6528f30a /configure.in | |
| parent | f809e037e9392da78c8f71149e8294010c743806 (diff) | |
| parent | 1230daf8f281bbb1ca07364b9a8c18ea4aa02a4d (diff) | |
| download | mariadb-git-fd07116e2f705ab5e54b614eba9f32cf10b8b0f1.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 7dfa7ae5e09..9e23b6cf61c 100644 --- a/configure.in +++ b/configure.in @@ -1873,13 +1873,6 @@ else fi AC_SUBST(TERMCAP_LIB) -# for libedit 2.6.7 -case "${host}" in - *-*-solaris2*) - AC_DEFINE_UNQUOTED(SUNOS, 1, [macro for libedit-2.6.7, current platform is solaris-2]) - ;; -esac - LIBEDIT_LOBJECTS="" AC_CHECK_FUNC(strunvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS unvis.o"]) AC_CHECK_FUNC(strvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS vis.o"]) @@ -2450,8 +2443,10 @@ elif test "$extra_charsets" = none; then CHARSETS="$CHARSETS" elif test "$extra_charsets" = complex; then CHARSETS="$CHARSETS $CHARSETS_COMPLEX" + AC_DEFINE([DEFINE_ALL_CHARACTER_SETS],1,[all charsets are available]) elif test "$extra_charsets" = all; then CHARSETS="$CHARSETS $CHARSETS_AVAILABLE" + AC_DEFINE([DEFINE_ALL_CHARACTER_SETS],1,[all charsets are available]) else EXTRA_CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'` CHARSETS="$CHARSETS $EXTRA_CHARSETS" |