diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-08-25 01:02:07 +0500 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-08-25 01:02:07 +0500 |
| commit | 6564806be70ec3e143f83731199054c68ae8e510 (patch) | |
| tree | d6eba79d8463612681893fea8fb939d07ad905f5 /configure.in | |
| parent | 6b20f46abc65f8b3dd851df71d04b89cb0d3f208 (diff) | |
| parent | c2d207e8b0c8837294153cf00c6fdcb442dc43b3 (diff) | |
| download | mariadb-git-6564806be70ec3e143f83731199054c68ae8e510.tar.gz | |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear
acinclude.m4:
Auto merged
configure.in:
Auto 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 a81e569bcde..d40cfbbae19 100644 --- a/configure.in +++ b/configure.in @@ -1874,6 +1874,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 ######################################################################### @@ -2341,10 +2357,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 |