From 65eee8392ff95f58f7b0bd036e1fe065523658c6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Jan 2017 02:33:29 -0800 Subject: [PATCH] =?utf8?q?Do=20not=20use=20Gnulib=E2=80=99s=20m4/wint=5Ft.?= =?utf8?q?m4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * admin/merge-gnulib: Remove m4/wint_t.m4 when merging. Fix typo so that warn-on-use.m4 is removed too. * configure.ac (gt_TYPE_WINT_T): New macro, replacing Gnulib’s. * m4/wint_t.m4: Remove. --- admin/merge-gnulib | 2 +- configure.ac | 4 +++ m4/wint_t.m4 | 62 ---------------------------------------------- 3 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 m4/wint_t.m4 diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 69db30cc41e..20a3240ea89 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -96,7 +96,7 @@ test -x "$gnulib_srcdir"/gnulib-tool || { "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ "$src"m4/gl-openssl.m4 \ - "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && + "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && { test -z "$src" || cd "$src"; } && diff --git a/configure.ac b/configure.ac index 642cf7b37a9..ce386f6c6c8 100644 --- a/configure.ac +++ b/configure.ac @@ -792,6 +792,10 @@ ac_func_list=$funcs AC_CHECK_FUNCS_ONCE([putenv]) AC_DEFUN([gl_FUNC_PUTENV], [test "$ac_cv_func_putenv" = yes || REPLACE_PUTENV=1]) +# Emacs does not use the wchar or wctype-h modules. +AC_DEFUN([gt_TYPE_WINT_T], + [GNULIB_OVERRIDES_WINT_T=0 + AC_SUBST([GNULIB_OVERRIDES_WINT_T])]) # Initialize gnulib right after choosing the compiler. dnl Amongst other things, this sets AR and ARFLAGS. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 deleted file mode 100644 index 65e25a4c38a..00000000000 --- a/m4/wint_t.m4 +++ /dev/null @@ -1,62 +0,0 @@ -# wint_t.m4 serial 6 -dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. -dnl Test whether has the 'wint_t' type and whether gnulib's -dnl or would, if present, override 'wint_t'. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be included - before . */ -#include -#include -#include -#include - wint_t foo = (wchar_t)'\0';]], - [[]])], - [gt_cv_c_wint_t=yes], - [gt_cv_c_wint_t=no])]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) - - dnl Determine whether gnulib's or would, if present, - dnl override 'wint_t'. - AC_CACHE_CHECK([whether wint_t is too small], - [gl_cv_type_wint_t_too_small], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#if !(defined __GLIBC__ && !defined __UCLIBC__) -# include -# include -# include -#endif -#include - int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; - ]])], - [gl_cv_type_wint_t_too_small=no], - [gl_cv_type_wint_t_too_small=yes])]) - if test $gl_cv_type_wint_t_too_small = yes; then - GNULIB_OVERRIDES_WINT_T=1 - else - GNULIB_OVERRIDES_WINT_T=0 - fi - else - GNULIB_OVERRIDES_WINT_T=0 - fi - AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -]) -- 2.39.5