summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in23
1 files changed, 4 insertions, 19 deletions
diff --git a/configure.in b/configure.in
index 7a694db2b69..0fdd962956d 100644
--- a/configure.in
+++ b/configure.in
@@ -701,11 +701,8 @@ AC_SUBST(MYSQLD_USER)
# If we should allow LOAD DATA LOCAL
AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
AC_ARG_ENABLE(local-infile,
- Enable LOAD DATA LOCAL INFILE (default: disabled)],
- [
- ENABLED_LOCAL_INFILE=$enableval
- AC_DEFINE(ENABLED_LOCAL_INFILE)
- ],
+ [ --enable-local-infile Enable LOAD DATA LOCAL INFILE (default: disabled)],
+ [ ENABLED_LOCAL_INFILE=$enableval ],
[ ENABLED_LOCAL_INFILE=no ]
)
if test "$ENABLED_LOCAL_INFILE" = "yes"
@@ -1734,26 +1731,14 @@ MYSQL_PTHREAD_YIELD
# For readline/libedit (We simply move the mimimum amount of stuff from
# the readline/libedit configure.in here)
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_AWK
-AC_PROG_INSTALL
-
dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(limits.h malloc.h sys/ioctl.h unistd.h sys/cdefs.h sys/types.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
+AC_CHECK_HEADERS(malloc.h sys/cdefs.h)
dnl Checks for library functions.
AC_FUNC_ALLOCA
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(re_comp regcomp strdup strerror strstr strtol)
+AC_CHECK_FUNCS(re_comp regcomp strdup)
AC_CHECK_HEADERS(vis.h)
AC_CHECK_FUNCS(strlcat strlcpy)