Commit a575f0b2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck


configure.in:
  Auto merged
parents 6e478b60 83bbd30c

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2370,7 +2370,7 @@ then 
    readline_basedir="libedit"

    readline_dir="$readline_topdir/$readline_basedir"

    readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.a"

    readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline readline"

    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/libedit/readline readline"

    compile_libedit=yes

    AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1)

    AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1)
@@ -2380,7 +2380,7 @@ then 
    readline_basedir="readline"

    readline_dir="$readline_topdir/$readline_basedir"

    readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"

    readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline readline"

    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"

    compile_readline=yes

    AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)

else