Module Name: src
Committed By: christos
Date: Mon Nov 25 23:03:18 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/dist: configure.ac
Log Message:
make configure.ac work with recent versions of autoconf
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/dist/dist/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/dist/configure.ac
diff -u src/external/bsd/nvi/dist/dist/configure.ac:1.1 src/external/bsd/nvi/dist/dist/configure.ac:1.2
--- src/external/bsd/nvi/dist/dist/configure.ac:1.1 Mon Nov 25 18:02:44 2013
+++ src/external/bsd/nvi/dist/dist/configure.ac Mon Nov 25 18:03:18 2013
@@ -1,10 +1,12 @@
-dnl $Id: configure.ac,v 1.1 2013/11/25 23:02:44 christos Exp $
+dnl $Id: configure.ac,v 1.2 2013/11/25 23:03:18 christos Exp $
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(../common/main.c)
+AC_INIT([vi], [1.81.6])
+AC_CONFIG_SRCDIR([../common/main.c])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(vi, 1.81.6)
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
dnl Configure setup.
AC_PROG_INSTALL()
@@ -78,6 +80,7 @@ AC_SUBST(CC)
CC=${CC-cc}
CFLAGS=${CFLAGS-""}
AC_PROG_CC
+AM_PROG_CC_C_O
if test "$GCC" = yes; then
AC_DEFINE(HAVE_GCC, 1, [Define if you have gcc.])
@@ -596,15 +599,14 @@ AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
-AC_CHECK_HEADER(sys/cdefs.h, [],
- [AC_CONFIG_FILES([sys/cdefs.h:../db.1.85/PORT/include/cdefs.h])])
+dnl AC_CHECK_HEADER(sys/cdefs.h, [], [AC_CONFIG_FILES([sys/cdefs.h:../db.1.85/PORT/include/cdefs.h])])
dnl Checks for library functions.
VI_CV_REPLACE_FUNCS(bsearch gethostname memchr memset)
VI_CV_REPLACE_FUNCS(mkstemp mmap strdup strpbrk)
VI_CV_REPLACE_FUNCS(snprintf vsnprintf)
-AC_CHECK_FUNCS(select)
+AC_CHECK_FUNCS(select memcpy)
AC_CHECK_FUNCS(setenv, [need_env=no], [need_env=yes])
AC_CHECK_FUNCS(strsep, [need_strsep=no], [need_strsep=yes])
AC_CHECK_FUNCS(unsetenv,, [need_env=yes])
