From: Paul Eggert Date: Mon, 2 Jul 2018 01:57:01 +0000 (-0700) Subject: wchar: fix bug when checking for ‘inline’ X-Git-Tag: v1.0~5530 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=285334ca5ac8f537bc183abd121aa68984e5a515;p=gnulib.git wchar: fix bug when checking for ‘inline’ I discovered this when looking into using the regex module with Emacs. * m4/wchar_h.m4 (gl_WCHAR_H_INLINE_OK): Fix bug introduced in 2016-08-17T23:09:38Z!skunk@iSKUNK.ORG; the code compiled conftest1.c and conftest2.c but these files were not created. As far as I can see, this check never worked and nobody reported it until now, which is a bit worrisome. --- diff --git a/ChangeLog b/ChangeLog index f556f04fbb..a220b9c412 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2018-07-01 Paul Eggert + + wchar: fix bug when checking for ‘inline’ + I discovered this when looking into using the regex module + with Emacs. + * m4/wchar_h.m4 (gl_WCHAR_H_INLINE_OK): Fix bug introduced in + 2016-08-17T23:09:38Z!skunk@iSKUNK.ORG; the code compiled + conftest1.c and conftest2.c but these files were not created. + As far as I can see, this check never worked and nobody reported + it until now, which is a bit worrisome. + 2018-06-30 Jim Meyering bootstrap: s/--option val/--option=val/ diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 416e0a1f80..a062ca981d 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 42 +# wchar_h.m4 serial 43 AC_DEFUN([gl_WCHAR_H], [ @@ -90,7 +90,8 @@ int main () { return zero(); } dnl that the object file has the latter name from the start. save_ac_compile="$ac_compile" ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if AC_TRY_EVAL([ac_compile]); then + if echo '#include "conftest.c"' >conftest1.c && + AC_TRY_EVAL([ac_compile]); then AC_LANG_CONFTEST([ AC_LANG_SOURCE([[#define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before @@ -105,7 +106,8 @@ int zero (void) { return 0; } ]])]) dnl See note above about renaming object files. ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if AC_TRY_EVAL([ac_compile]); then + if echo '#include "conftest.c"' >conftest2.c && + AC_TRY_EVAL([ac_compile]); then if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then : else @@ -114,7 +116,7 @@ int zero (void) { return 0; } fi fi ac_compile="$save_ac_compile" - rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext + rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext ]) if test $gl_cv_header_wchar_h_correct_inline = no; then AC_MSG_ERROR([ cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).