diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 30 | ||||
| -rw-r--r-- | m4/strtoull.m4 | 24 | ||||
| -rw-r--r-- | m4/strtoumax.m4 | 28 |
3 files changed, 0 insertions, 82 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 3f196d4f1de..8f53a990e34 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 | |||
| @@ -140,8 +140,6 @@ AC_DEFUN([gl_EARLY], | |||
| 140 | # Code from module string: | 140 | # Code from module string: |
| 141 | # Code from module strtoimax: | 141 | # Code from module strtoimax: |
| 142 | # Code from module strtoll: | 142 | # Code from module strtoll: |
| 143 | # Code from module strtoull: | ||
| 144 | # Code from module strtoumax: | ||
| 145 | # Code from module symlink: | 143 | # Code from module symlink: |
| 146 | # Code from module sys_select: | 144 | # Code from module sys_select: |
| 147 | # Code from module sys_stat: | 145 | # Code from module sys_stat: |
| @@ -364,12 +362,6 @@ AC_DEFUN([gl_INIT], | |||
| 364 | gl_PREREQ_STRTOIMAX | 362 | gl_PREREQ_STRTOIMAX |
| 365 | fi | 363 | fi |
| 366 | gl_INTTYPES_MODULE_INDICATOR([strtoimax]) | 364 | gl_INTTYPES_MODULE_INDICATOR([strtoimax]) |
| 367 | gl_FUNC_STRTOUMAX | ||
| 368 | if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then | ||
| 369 | AC_LIBOBJ([strtoumax]) | ||
| 370 | gl_PREREQ_STRTOUMAX | ||
| 371 | fi | ||
| 372 | gl_INTTYPES_MODULE_INDICATOR([strtoumax]) | ||
| 373 | gl_FUNC_SYMLINK | 365 | gl_FUNC_SYMLINK |
| 374 | if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then | 366 | if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then |
| 375 | AC_LIBOBJ([symlink]) | 367 | AC_LIBOBJ([symlink]) |
| @@ -420,7 +412,6 @@ AC_DEFUN([gl_INIT], | |||
| 420 | gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false | 412 | gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false |
| 421 | gl_gnulib_enabled_secure_getenv=false | 413 | gl_gnulib_enabled_secure_getenv=false |
| 422 | gl_gnulib_enabled_strtoll=false | 414 | gl_gnulib_enabled_strtoll=false |
| 423 | gl_gnulib_enabled_strtoull=false | ||
| 424 | gl_gnulib_enabled_tempname=false | 415 | gl_gnulib_enabled_tempname=false |
| 425 | gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=false | 416 | gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=false |
| 426 | func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b () | 417 | func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b () |
| @@ -569,18 +560,6 @@ AC_DEFUN([gl_INIT], | |||
| 569 | gl_gnulib_enabled_strtoll=true | 560 | gl_gnulib_enabled_strtoll=true |
| 570 | fi | 561 | fi |
| 571 | } | 562 | } |
| 572 | func_gl_gnulib_m4code_strtoull () | ||
| 573 | { | ||
| 574 | if ! $gl_gnulib_enabled_strtoull; then | ||
| 575 | gl_FUNC_STRTOULL | ||
| 576 | if test $HAVE_STRTOULL = 0; then | ||
| 577 | AC_LIBOBJ([strtoull]) | ||
| 578 | gl_PREREQ_STRTOULL | ||
| 579 | fi | ||
| 580 | gl_STDLIB_MODULE_INDICATOR([strtoull]) | ||
| 581 | gl_gnulib_enabled_strtoull=true | ||
| 582 | fi | ||
| 583 | } | ||
| 584 | func_gl_gnulib_m4code_tempname () | 563 | func_gl_gnulib_m4code_tempname () |
| 585 | { | 564 | { |
| 586 | if ! $gl_gnulib_enabled_tempname; then | 565 | if ! $gl_gnulib_enabled_tempname; then |
| @@ -649,9 +628,6 @@ AC_DEFUN([gl_INIT], | |||
| 649 | if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then | 628 | if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then |
| 650 | func_gl_gnulib_m4code_strtoll | 629 | func_gl_gnulib_m4code_strtoll |
| 651 | fi | 630 | fi |
| 652 | if { test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes; then | ||
| 653 | func_gl_gnulib_m4code_strtoull | ||
| 654 | fi | ||
| 655 | if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then | 631 | if test $HAVE_TIMEGM = 0 || test $REPLACE_TIMEGM = 1; then |
| 656 | func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31 | 632 | func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31 |
| 657 | fi | 633 | fi |
| @@ -670,7 +646,6 @@ AC_DEFUN([gl_INIT], | |||
| 670 | AM_CONDITIONAL([gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c], [$gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c]) | 646 | AM_CONDITIONAL([gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c], [$gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c]) |
| 671 | AM_CONDITIONAL([gl_GNULIB_ENABLED_secure_getenv], [$gl_gnulib_enabled_secure_getenv]) | 647 | AM_CONDITIONAL([gl_GNULIB_ENABLED_secure_getenv], [$gl_gnulib_enabled_secure_getenv]) |
| 672 | AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoll], [$gl_gnulib_enabled_strtoll]) | 648 | AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoll], [$gl_gnulib_enabled_strtoll]) |
| 673 | AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoull], [$gl_gnulib_enabled_strtoull]) | ||
| 674 | AM_CONDITIONAL([gl_GNULIB_ENABLED_tempname], [$gl_gnulib_enabled_tempname]) | 649 | AM_CONDITIONAL([gl_GNULIB_ENABLED_tempname], [$gl_gnulib_enabled_tempname]) |
| 675 | AM_CONDITIONAL([gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec], [$gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec]) | 650 | AM_CONDITIONAL([gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec], [$gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec]) |
| 676 | # End of code from modules | 651 | # End of code from modules |
| @@ -940,9 +915,6 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 940 | lib/strtoimax.c | 915 | lib/strtoimax.c |
| 941 | lib/strtol.c | 916 | lib/strtol.c |
| 942 | lib/strtoll.c | 917 | lib/strtoll.c |
| 943 | lib/strtoul.c | ||
| 944 | lib/strtoull.c | ||
| 945 | lib/strtoumax.c | ||
| 946 | lib/symlink.c | 918 | lib/symlink.c |
| 947 | lib/sys_select.in.h | 919 | lib/sys_select.in.h |
| 948 | lib/sys_stat.in.h | 920 | lib/sys_stat.in.h |
| @@ -1051,8 +1023,6 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 1051 | m4/string_h.m4 | 1023 | m4/string_h.m4 |
| 1052 | m4/strtoimax.m4 | 1024 | m4/strtoimax.m4 |
| 1053 | m4/strtoll.m4 | 1025 | m4/strtoll.m4 |
| 1054 | m4/strtoull.m4 | ||
| 1055 | m4/strtoumax.m4 | ||
| 1056 | m4/symlink.m4 | 1026 | m4/symlink.m4 |
| 1057 | m4/sys_select_h.m4 | 1027 | m4/sys_select_h.m4 |
| 1058 | m4/sys_socket_h.m4 | 1028 | m4/sys_socket_h.m4 |
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 deleted file mode 100644 index c6b215072b6..00000000000 --- a/m4/strtoull.m4 +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | # strtoull.m4 serial 7 | ||
| 2 | dnl Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. | ||
| 3 | dnl This file is free software; the Free Software Foundation | ||
| 4 | dnl gives unlimited permission to copy and/or distribute it, | ||
| 5 | dnl with or without modifications, as long as this notice is preserved. | ||
| 6 | |||
| 7 | AC_DEFUN([gl_FUNC_STRTOULL], | ||
| 8 | [ | ||
| 9 | AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) | ||
| 10 | dnl We don't need (and can't compile) the replacement strtoull | ||
| 11 | dnl unless the type 'unsigned long long int' exists. | ||
| 12 | AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) | ||
| 13 | if test "$ac_cv_type_unsigned_long_long_int" = yes; then | ||
| 14 | AC_CHECK_FUNCS([strtoull]) | ||
| 15 | if test $ac_cv_func_strtoull = no; then | ||
| 16 | HAVE_STRTOULL=0 | ||
| 17 | fi | ||
| 18 | fi | ||
| 19 | ]) | ||
| 20 | |||
| 21 | # Prerequisites of lib/strtoull.c. | ||
| 22 | AC_DEFUN([gl_PREREQ_STRTOULL], [ | ||
| 23 | : | ||
| 24 | ]) | ||
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 deleted file mode 100644 index 43ef5b5abbf..00000000000 --- a/m4/strtoumax.m4 +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | # strtoumax.m4 serial 12 | ||
| 2 | dnl Copyright (C) 2002-2004, 2006, 2009-2017 Free Software Foundation, Inc. | ||
| 3 | dnl This file is free software; the Free Software Foundation | ||
| 4 | dnl gives unlimited permission to copy and/or distribute it, | ||
| 5 | dnl with or without modifications, as long as this notice is preserved. | ||
| 6 | |||
| 7 | AC_DEFUN([gl_FUNC_STRTOUMAX], | ||
| 8 | [ | ||
| 9 | AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) | ||
| 10 | |||
| 11 | dnl On OSF/1 5.1 with cc, this function is declared but not defined. | ||
| 12 | AC_CHECK_FUNCS_ONCE([strtoumax]) | ||
| 13 | AC_CHECK_DECLS_ONCE([strtoumax]) | ||
| 14 | if test "$ac_cv_have_decl_strtoumax" = yes; then | ||
| 15 | if test "$ac_cv_func_strtoumax" != yes; then | ||
| 16 | # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. | ||
| 17 | REPLACE_STRTOUMAX=1 | ||
| 18 | fi | ||
| 19 | else | ||
| 20 | HAVE_DECL_STRTOUMAX=0 | ||
| 21 | fi | ||
| 22 | ]) | ||
| 23 | |||
| 24 | # Prerequisites of lib/strtoumax.c. | ||
| 25 | AC_DEFUN([gl_PREREQ_STRTOUMAX], [ | ||
| 26 | AC_CHECK_DECLS([strtoull]) | ||
| 27 | AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) | ||
| 28 | ]) | ||