diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-24 22:35:14 +0000 |
| commit | 8bb0aaa51661bc842832ad131cb43b6f0e50f29a (patch) | |
| tree | 0138fe722f01dc674c37ea0e9b7f181bcd863f82 /configure.in | |
| parent | 1e91f015caeeec47c65b754d19ac956d79ded31d (diff) | |
| parent | 9f2b7e91b6a6eee0e4e1629ea4d55782a81c78bb (diff) | |
| download | mariadb-git-8bb0aaa51661bc842832ad131cb43b6f0e50f29a.tar.gz | |
Merge
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
SCCS merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/configure.in b/configure.in index a4b38778363..3bee418a270 100644 --- a/configure.in +++ b/configure.in @@ -1872,6 +1872,22 @@ 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"]) +AC_CHECK_FUNC(strlcpy, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcpy.o"]) +AC_CHECK_FUNC(strlcat, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcat.o"]) +AC_CHECK_FUNC(fgetln, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS fgetln.o"]) +AC_SUBST(LIBEDIT_LOBJECTS) +enable_readline="yes" + # End of readline/libedit stuff ######################################################################### @@ -2339,10 +2355,10 @@ then readline_topdir="cmd-line-utils" readline_basedir="libedit" readline_dir="$readline_topdir/$readline_basedir" - readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a" + readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.a" readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline readline" compile_libedit=yes - AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY) + AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1) AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1) elif test "$with_readline" = "yes" then |