Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

jsteemann · jsteemann · commit e0983ef24249 · 2015-10-26T09:17:30.000+01:00
diff --git a/configure.ac b/configure.ac
@@ -593,7 +593,7 @@ AC_MSG_NOTICE([-----------------------------------------------------------------
 CONSOLE_CPPFLAGS=""
 
 AC_ARG_ENABLE(console,
-  AS_HELP_STRING([--enable-console], [enable console support (default: readline)]),
+  AS_HELP_STRING([--enable-console], [enable console support (default: linenoise)]),
   tr_CONSOLE="$enableval",
   tr_CONSOLE="linenoise"
 )

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ AC_MSG_NOTICE([-----------------------------------------------------------------`
`593`	`593`	`CONSOLE_CPPFLAGS=""`
`594`	`594`
`595`	`595`	`AC_ARG_ENABLE(console,`
`596`		`- AS_HELP_STRING([--enable-console], [enable console support (default: readline)]),`
	`596`	`+ AS_HELP_STRING([--enable-console], [enable console support (default: linenoise)]),`
`597`	`597`	`tr_CONSOLE="$enableval",`
`598`	`598`	`tr_CONSOLE="linenoise"`
`599`	`599`	`)`