diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-21 21:51:22 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-21 21:51:22 +0300 |
| commit | b33eb7a4bf226ce8d9f568927f875afe290d9b06 (patch) | |
| tree | 694b8a499ed9c3a13dffa38ec968673d49ac3389 /extension | |
| parent | b723f14ac83c52de73771a97b0b84d97cc640fd0 (diff) | |
| parent | 79bdf495760451af2b7f7ef209d5f4c82e9929fa (diff) | |
| download | egawk-b33eb7a4bf226ce8d9f568927f875afe290d9b06.tar.gz egawk-b33eb7a4bf226ce8d9f568927f875afe290d9b06.tar.bz2 egawk-b33eb7a4bf226ce8d9f568927f875afe290d9b06.zip | |
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 14 | ||||
| -rw-r--r-- | extension/Makefile.am | 5 | ||||
| -rw-r--r-- | extension/Makefile.in | 5 | ||||
| -rwxr-xr-x | extension/configure | 14 | ||||
| -rw-r--r-- | extension/testext.c | 2 |
5 files changed, 28 insertions, 12 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index e0a24664..546006ff 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,17 @@ +2017-08-21 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (ntdiv_la_LIBADD): Add -lm for Solaris systems, + per report from Nelson H.F. Beebe. + +2017-08-21 Daniel Richard G. <skunk@iSKUNK.ORG> + + * configure: Regenerated after update to m4/arch.m4. + +2017-08-19 Eli Zaretskii <eliz@gnu.org> + + * testext.c (test_get_file): Don't remove outfile from the Gawk + script, as that fails on MS-Windows. + 2017-08-14 Arnold D. Robbins <arnold@skeeve.com> * configure.ac: Bump associated gawk version. diff --git a/extension/Makefile.am b/extension/Makefile.am index 147da40a..df55b98f 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -73,10 +73,11 @@ inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) -# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries +# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries. +# Solaris in addition wants the math library. intdiv_la_SOURCES = intdiv.c intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) -intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) +intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) -lm ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) diff --git a/extension/Makefile.in b/extension/Makefile.in index 917618cb..f4bb6289 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -558,10 +558,11 @@ inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) -# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries +# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries. +# Solaris in addition wants the math library. intdiv_la_SOURCES = intdiv.c intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) -intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) +intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) -lm ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) ordchr_la_LIBADD = $(MY_LIBS) diff --git a/extension/configure b/extension/configure index d1c146c4..985e3079 100755 --- a/extension/configure +++ b/extension/configure @@ -3682,14 +3682,14 @@ $as_echo "${ac_cv_zos_uss}" >&6; } if test "x$ac_cv_zos_uss" = "xyes" then ac_zos_uss_cc_id=unknown - echo " $CC " | $EGREP ' (/bin/)?c89 |_' >/dev/null && ac_zos_uss_cc_id=c89 - echo " $CC " | $EGREP ' (/bin/)?c99 |_' >/dev/null && ac_zos_uss_cc_id=xlc - echo " $CC " | $EGREP ' (/bin/)?cc |_' >/dev/null && ac_zos_uss_cc_id=cc - echo " $CC " | $EGREP ' (/bin/)?xlc |_' >/dev/null && ac_zos_uss_cc_id=xlc - echo " $CC " | $EGREP ' (/bin/)?xlC |_' >/dev/null && ac_zos_uss_cc_id=xlc++ - echo " $CC " | $EGREP ' (/bin/)?xlc\+\+ |_' >/dev/null && ac_zos_uss_cc_id=xlc++ + echo " $CC " | $EGREP ' (/bin/)?c89[ |_]' >/dev/null && ac_zos_uss_cc_id=c89 + echo " $CC " | $EGREP ' (/bin/)?c99[ |_]' >/dev/null && ac_zos_uss_cc_id=xlc + echo " $CC " | $EGREP ' (/bin/)?cc[ |_]' >/dev/null && ac_zos_uss_cc_id=cc + echo " $CC " | $EGREP ' (/bin/)?xlc[ |_]' >/dev/null && ac_zos_uss_cc_id=xlc + echo " $CC " | $EGREP ' (/bin/)?xlC[ |_]' >/dev/null && ac_zos_uss_cc_id=xlc++ + echo " $CC " | $EGREP ' (/bin/)?xlc\+\+[ |_]' >/dev/null && ac_zos_uss_cc_id=xlc++ test "x$GCC" = "xyes" && ac_zos_uss_cc_id=gcc - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" + CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE -D_OPEN_SYS_UNLOCKED_EXT" test "$ac_zos_uss_cc_id" != xlc++ && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" case "$ac_zos_uss_cc_id" in c89) diff --git a/extension/testext.c b/extension/testext.c index 572475e0..c1a03f5b 100644 --- a/extension/testext.c +++ b/extension/testext.c @@ -847,7 +847,7 @@ BEGIN { while ((getline < alias) > 0) printf "File [%s] nr [%s]: %s\n", alias, ++nr, $0 close(alias) - system("rm " outfile) +# system("rm " outfile) print "" } */ |