Merge branch 'gawk-4.1-stable'

6 files changed, 11 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index a18e8d34..613487a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac (AC_FUNC_VPRINTF): Remove. Not needed on current
+	systems.
+	* awk.h (HAVE_VPRINTF): Remove check.
+
 2013-12-10         Scott Deifik          <scottd.mail@sbcglobal.net>
 
 	* io.c (closemaybesocket): Add definition for DJGPP.
diff --git a/NEWS b/NEWS
index 57db807c..f988a4fa 100644
--- a/NEWS
+++ b/NEWS
@@ -31,7 +31,11 @@ Changes from 4.1.0 to 4.1.1
 
 5. The debugger now lists source code correctly under Cygwin.
 
-6. The -O option now works again.
+6. Configuration and building Mac OS X libreadline should work now.
+
+7. The -O option now works again.
+
+8. The --include option, documented since 4.0, now actually works.
 
 XXX. A number of bugs have been fixed. See the ChangeLog.
 
diff --git a/awk.h b/awk.h
index 0b2b9972..e0964b94 100644
--- a/awk.h
+++ b/awk.h
@@ -180,10 +180,6 @@ typedef int off_t;
 #define O_BINARY	0
 #endif
 
-#ifndef HAVE_VPRINTF
-#error "you lose: you need a system with vfprintf"
-#endif	/* HAVE_VPRINTF */
-
 #ifndef HAVE_SETLOCALE
 #define setlocale(locale, val)	/* nothing */
 #endif /* HAVE_SETLOCALE */
diff --git a/configh.in b/configh.in
index a535fd4b..bfffd853 100644
--- a/configh.in
+++ b/configh.in
@@ -42,9 +42,6 @@
    */
 #undef HAVE_DECL_TZNAME
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -296,9 +293,6 @@
 /* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
diff --git a/configure b/configure
index 034698ed..f9962fb2 100755
--- a/configure
+++ b/configure
@@ -8980,25 +8980,6 @@ fi
 
 
 
-for ac_func in vprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF
-
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
-
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
 
 
 
diff --git a/configure.ac b/configure.ac
index 3c6a7580..d97aad8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,6 @@ dnl Check for C11 _Noreturn
 GAWK_AC_NORETURN
 
 dnl checks for functions
-AC_FUNC_VPRINTF
 AC_FUNC_MKTIME
 case "$ac_cv_func_working_mktime" in
 yes)	AC_DEFINE(HAVE_MKTIME, 1, [we have the mktime function])