diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-10 12:09:57 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-10 12:09:57 +0000 |
| commit | f29fb7f0c90f5bd49edc591bca993fff2a822229 (patch) | |
| tree | 8a5bf65befab636f3362ead9afebac3096411962 /Build | |
| parent | 970d1dcb0d73b9f189a2819d45e30920b96a21d6 (diff) | |
Build system: Drop checks for strcasecmp(), strstr(), and strtol()
git-svn-id: svn://tug.org/texlive/trunk@36474 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
87 files changed, 183 insertions, 1074 deletions
diff --git a/Build/source/configure b/Build/source/configure index 8ea20337956..64751a3b0ba 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -16274,13 +16274,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/libs/mpfr/ChangeLog b/Build/source/libs/mpfr/ChangeLog index deb9dbeccbb..2cc42249082 100644 --- a/Build/source/libs/mpfr/ChangeLog +++ b/Build/source/libs/mpfr/ChangeLog @@ -1,3 +1,8 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * m4/mpfr-configs.m4: Drop useless checks for memmove, memset, + and strtol. + 2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use the fragment ../../am/dist_hook.am. diff --git a/Build/source/libs/mpfr/config.h.in b/Build/source/libs/mpfr/config.h.in index 6cb4b246591..71f81eceba8 100644 --- a/Build/source/libs/mpfr/config.h.in +++ b/Build/source/libs/mpfr/config.h.in @@ -37,15 +37,9 @@ /* Define if compiler supports long long */ #undef HAVE_LONG_LONG -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - /* Define if stdarg */ #undef HAVE_STDARG @@ -61,9 +55,6 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H diff --git a/Build/source/libs/mpfr/configure b/Build/source/libs/mpfr/configure index 45a9bb5c850..57483f9956c 100755 --- a/Build/source/libs/mpfr/configure +++ b/Build/source/libs/mpfr/configure @@ -5754,19 +5754,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -for ac_func in memmove memset strtol -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - case $host in #( alpha*-*-*) : diff --git a/Build/source/libs/mpfr/m4/mpfr-configs.m4 b/Build/source/libs/mpfr/m4/mpfr-configs.m4 index 680cf953c4f..d4c8373a05e 100644 --- a/Build/source/libs/mpfr/m4/mpfr-configs.m4 +++ b/Build/source/libs/mpfr/m4/mpfr-configs.m4 @@ -2,7 +2,7 @@ # Copyright (C) 2000-2013 Free Software Foundation, Inc. # Contributed by the AriC and Caramel projects, INRIA. # -# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org> # Extracted from mpfr-3.1.2/acinclude.m4 and adapted for TeX Live. # # This file is free software; the copyright holders @@ -53,12 +53,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_RESULT([__va_copy])], [AC_MSG_RESULT([memcpy])])]) -dnl FIXME: The functions memmove, memset and strtol are really needed by -dnl MPFR, but if they are implemented as macros, this is also OK (in our -dnl case). So, we do not return an error, but their tests are currently -dnl useless. -AC_CHECK_FUNCS([memmove memset strtol]) - dnl Check for IEEE-754 switches on Alpha AS_CASE([$host], [alpha*-*-*], [ diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index aea24a0e4df..90582391f89 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-common.m4 (KPSE_COMMON): Drop checks for strcasecmp, + strtol, and strstr. + 2015-03-07 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-win32.m4: Define KPSE_DO_IF_WIN32 for WIN32 only tests. diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4 index 70a4c48d79f..dfd98d9cbb8 100644 --- a/Build/source/m4/kpse-common.m4 +++ b/Build/source/m4/kpse-common.m4 @@ -1,6 +1,6 @@ # Public macros for the TeX Live (TL) tree. # Copyright (C) 1995-2009 Karl Berry <tex-live@tug.org> -# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -248,7 +248,7 @@ AC_FUNC_CLOSEDIR_VOID AC_CHECK_HEADERS([assert.h float.h limits.h pwd.h stdlib.h sys/param.h]) dnl dnl Replacement functions that may be required on ancient broken system. -AC_CHECK_FUNCS([putenv strcasecmp strtol strstr]) +AC_CHECK_FUNCS([putenv]) dnl dnl More common functions AC_CHECK_FUNCS([getcwd getwd memcmp memcpy mkstemp mktemp strchr strrchr]) diff --git a/Build/source/texk/afm2pl/c-auto.in b/Build/source/texk/afm2pl/c-auto.in index 0d82468093d..10ccac6b77f 100644 --- a/Build/source/texk/afm2pl/c-auto.in +++ b/Build/source/texk/afm2pl/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure index e91da09b62f..df644e834ea 100755 --- a/Build/source/texk/afm2pl/configure +++ b/Build/source/texk/afm2pl/configure @@ -13208,13 +13208,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/bibtex-x/config.h.in b/Build/source/texk/bibtex-x/config.h.in index f84610f53fb..eac808dace1 100644 --- a/Build/source/texk/bibtex-x/config.h.in +++ b/Build/source/texk/bibtex-x/config.h.in @@ -64,9 +64,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -79,12 +76,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure index 483aa6d4ba4..a2b2956e528 100755 --- a/Build/source/texk/bibtex-x/configure +++ b/Build/source/texk/bibtex-x/configure @@ -13445,13 +13445,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index 6670e780339..2008d557d80 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop check for strtol. + 2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use the fragment ../../am/dist_hook.am. diff --git a/Build/source/texk/chktex/config.h.in b/Build/source/texk/chktex/config.h.in index a58618b653c..94e6d1770e6 100644 --- a/Build/source/texk/chktex/config.h.in +++ b/Build/source/texk/chktex/config.h.in @@ -122,12 +122,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure index 11bc6811438..c1f033de9c5 100755 --- a/Build/source/texk/chktex/configure +++ b/Build/source/texk/chktex/configure @@ -13263,13 +13263,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi @@ -13498,7 +13497,7 @@ fi done -for ac_func in access closedir fileno isatty opendir readdir stat strcasecmp strdup strlwr strtol +for ac_func in access closedir fileno isatty opendir readdir stat strcasecmp strdup strlwr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/Build/source/texk/chktex/configure.ac b/Build/source/texk/chktex/configure.ac index 3a451513d40..85134e8eb36 100644 --- a/Build/source/texk/chktex/configure.ac +++ b/Build/source/texk/chktex/configure.ac @@ -29,7 +29,7 @@ AC_CHECK_HEADERS([stat.h stdarg.h sys/stat.h]) dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS([access closedir fileno isatty opendir readdir stat strcasecmp strdup strlwr strtol]) +AC_CHECK_FUNCS([access closedir fileno isatty opendir readdir stat strcasecmp strdup strlwr]) dnl Checks for declarations. AC_CHECK_DECLS([stpcpy]) diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 66f85dffa9b..8129f4ba1ae 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop checks for strdup, strstr, strtol, strtoul. + 2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use the fragment ../../am/dist_hook.am. diff --git a/Build/source/texk/cjkutils/c-auto.in b/Build/source/texk/cjkutils/c-auto.in index 45b39664ae8..bd8e787fcff 100644 --- a/Build/source/texk/cjkutils/c-auto.in +++ b/Build/source/texk/cjkutils/c-auto.in @@ -64,15 +64,9 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H @@ -82,15 +76,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index cff490fa40f..1a4aee40978 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -13209,13 +13209,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi @@ -13471,18 +13470,6 @@ fi done -for ac_func in strdup strstr strtol strtoul -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - if test "x$ac_cv_func_strdup" = xno; then XX_CPPFLAGS=-DNO_STRDUP diff --git a/Build/source/texk/cjkutils/configure.ac b/Build/source/texk/cjkutils/configure.ac index fdaeba73fe8..bcfa51f16cb 100644 --- a/Build/source/texk/cjkutils/configure.ac +++ b/Build/source/texk/cjkutils/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -27,7 +27,6 @@ AC_STRUCT_TM dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS([strdup strstr strtol strtoul]) dnl we need this for hbf.c if test "x$ac_cv_func_strdup" = xno; then diff --git a/Build/source/texk/detex/c-auto.in b/Build/source/texk/detex/c-auto.in index e27386e25a7..5ff502e71b2 100644 --- a/Build/source/texk/detex/c-auto.in +++ b/Build/source/texk/detex/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure index bc62c62d7ff..0eaf67564ca 100755 --- a/Build/source/texk/detex/configure +++ b/Build/source/texk/detex/configure @@ -13212,13 +13212,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dtl/config.h.in b/Build/source/texk/dtl/config.h.in index 62f951c601b..b69f3400ba5 100644 --- a/Build/source/texk/dtl/config.h.in +++ b/Build/source/texk/dtl/config.h.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure index 86d30548f4b..854956d28a2 100755 --- a/Build/source/texk/dtl/configure +++ b/Build/source/texk/dtl/configure @@ -13390,13 +13390,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvi2tty/c-auto.in b/Build/source/texk/dvi2tty/c-auto.in index 0d82468093d..10ccac6b77f 100644 --- a/Build/source/texk/dvi2tty/c-auto.in +++ b/Build/source/texk/dvi2tty/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index d1504a03ef7..6363b2eb00c 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -13221,13 +13221,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvidvi/config.h.in b/Build/source/texk/dvidvi/config.h.in index 64aa9024d47..1028cb33195 100644 --- a/Build/source/texk/dvidvi/config.h.in +++ b/Build/source/texk/dvidvi/config.h.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure index 4c0c1f9ec87..b3ed2635a40 100755 --- a/Build/source/texk/dvidvi/configure +++ b/Build/source/texk/dvidvi/configure @@ -13208,13 +13208,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dviljk/c-auto.in b/Build/source/texk/dviljk/c-auto.in index 0a7f4577b6c..c7a88fd07ce 100644 --- a/Build/source/texk/dviljk/c-auto.in +++ b/Build/source/texk/dviljk/c-auto.in @@ -67,9 +67,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -82,12 +79,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure index 37e5ee5c054..90ff56d4437 100755 --- a/Build/source/texk/dviljk/configure +++ b/Build/source/texk/dviljk/configure @@ -13386,13 +13386,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvipdfm-x/config.h.in b/Build/source/texk/dvipdfm-x/config.h.in index f39ea456ff6..6b2c0eff10c 100644 --- a/Build/source/texk/dvipdfm-x/config.h.in +++ b/Build/source/texk/dvipdfm-x/config.h.in @@ -86,9 +86,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -101,12 +98,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index f05488c46a9..3b2ea07e5ec 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -13480,13 +13480,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index d62115ec589..47458732142 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop checks for strstr and strtol. + 2015-03-07 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Check for texlive_gs_init(), if Windows. diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in index dc860749206..8fe23dbaff4 100644 --- a/Build/source/texk/dvipng/config.h.in +++ b/Build/source/texk/dvipng/config.h.in @@ -148,9 +148,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -163,12 +160,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index b7f3e7dc63a..e5250169e87 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -13271,13 +13271,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi @@ -14483,7 +14482,7 @@ fi done -for ac_func in dup2 memset munmap pow putenv strchr strrchr strtol strstr +for ac_func in dup2 memset munmap pow putenv strchr strrchr do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index a951c47be47..fc52f4f8dd3 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -70,7 +70,7 @@ AC_TYPE_PID_T AC_FUNC_MMAP AC_FUNC_STRTOD AC_FUNC_VPRINTF -AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr]) +AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr]) if test "x$enable_timing" = xyes; then AC_CHECK_FUNCS([ftime gettimeofday]) diff --git a/Build/source/texk/dvipos/c-auto.in b/Build/source/texk/dvipos/c-auto.in index 0d82468093d..10ccac6b77f 100644 --- a/Build/source/texk/dvipos/c-auto.in +++ b/Build/source/texk/dvipos/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index 6b51050c555..3ae61b1ec58 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -13208,13 +13208,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvipsk/c-auto.in b/Build/source/texk/dvipsk/c-auto.in index e5779bf653e..13fd63217fb 100644 --- a/Build/source/texk/dvipsk/c-auto.in +++ b/Build/source/texk/dvipsk/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure index f8f8cb43832..12d49107bcd 100755 --- a/Build/source/texk/dvipsk/configure +++ b/Build/source/texk/dvipsk/configure @@ -13393,13 +13393,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/dvisvgm/config.h.in b/Build/source/texk/dvisvgm/config.h.in index 6558d6d695b..9e89c899eb1 100644 --- a/Build/source/texk/dvisvgm/config.h.in +++ b/Build/source/texk/dvisvgm/config.h.in @@ -85,9 +85,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -100,12 +97,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 92f015f36fe..44dbe164b92 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -13487,13 +13487,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/gsftopk/c-auto.in b/Build/source/texk/gsftopk/c-auto.in index fbc3b370787..0b27bc7275f 100644 --- a/Build/source/texk/gsftopk/c-auto.in +++ b/Build/source/texk/gsftopk/c-auto.in @@ -76,9 +76,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -91,12 +88,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index 2a74877ea74..17657853073 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -13208,13 +13208,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index bde213e16db..656b42ce232 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop checks for strcasecmp, strtol, and strstr. + * lib.h: Drop the strstr() prototype. + * Makefile.am: No need to distribute the replacement functions. + 2014-12-13 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmf.cnf: Sync with master which is changed by Norbert. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 17ab473710a..e72d1037b56 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/kpathsea/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## SUBDIRS = . doc man @@ -106,10 +106,7 @@ endif !WIN32 $(libkpathsea_la_OBJECTS): paths.h kpathsea.h EXTRA_DIST += \ - putenv.c \ - strcasecmp.c \ - strtol.c \ - strstr.c + putenv.c kpseincludedir = ${includedir}/kpathsea diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 642b71ecfa2..92a7cb88c3b 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -527,8 +527,7 @@ am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c \ - strcasecmp.c strstr.c strtol.c + ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -694,8 +693,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . doc man $(am__append_6) -EXTRA_DIST = PROJECTS putenv.c strcasecmp.c strtol.c strstr.c bsnl.awk \ - cnf-to-paths.awk $(TESTS) tests/cnfnewline/texmf.cnf mktex.cnf +EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \ + tests/cnfnewline/texmf.cnf mktex.cnf AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libkpathsea.la @@ -1018,9 +1017,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtol.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpsestat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpsewhich.Po@am__quote@ diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in index 78f48eb47dd..00e20cb020e 100644 --- a/Build/source/texk/kpathsea/c-auto.in +++ b/Build/source/texk/kpathsea/c-auto.in @@ -39,10 +39,6 @@ */ #undef HAVE_DECL_PUTENV -/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. - */ -#undef HAVE_DECL_STRSTR - /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -98,9 +94,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -113,12 +106,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index 3b0a054be1e..deac639ba1c 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -13463,13 +13463,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi @@ -13884,16 +13883,6 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_PUTENV $ac_have_decl _ACEOF -ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" -if test "x$ac_cv_have_decl_strstr" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRSTR $ac_have_decl -_ACEOF ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" if test "x$ac_cv_func_putenv" = xyes; then : @@ -13908,45 +13897,6 @@ esac fi -ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : - $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strcasecmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" - ;; -esac - -fi - -ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" -if test "x$ac_cv_func_strtol" = xyes; then : - $as_echo "#define HAVE_STRTOL 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strtol.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtol.$ac_objext" - ;; -esac - -fi - -ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" -if test "x$ac_cv_func_strstr" = xyes; then : - $as_echo "#define HAVE_STRSTR 1" >>confdefs.h - -else - case " $LIBOBJS " in - *" strstr.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strstr.$ac_objext" - ;; -esac - -fi - if test "x$ac_cv_func_getcwd" = xyes; then diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac index e20f7a83fe4..d2e08afa404 100644 --- a/Build/source/texk/kpathsea/configure.ac +++ b/Build/source/texk/kpathsea/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -36,8 +36,8 @@ AC_PROG_AWK AC_CHECK_SIZEOF([long]) dnl Replacement functions that may be required on ancient broken system. -AC_CHECK_DECLS([putenv, strstr]) -AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr]) +AC_CHECK_DECLS([putenv]) +AC_REPLACE_FUNCS([putenv]) if test "x$ac_cv_func_getcwd" = xyes; then # We only need to run this if we have getcwd. diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h index 2aac2519b3d..8c1f8e1ecc4 100644 --- a/Build/source/texk/kpathsea/lib.h +++ b/Build/source/texk/kpathsea/lib.h @@ -1,7 +1,7 @@ /* lib.h: declarations for common, low-level routines in kpathsea. Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010, 2011, - 2012 Karl Berry. + 2012, 2015 Karl Berry. Copyright 1999, 2000, 2003, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -151,10 +151,6 @@ extern KPSEDLL const_string xbasename (const_string name); /* Return directory part of NAME. This returns a new string. */ extern KPSEDLL string xdirname (const_string name); -#if !HAVE_DECL_STRSTR -extern string strstr (const_string haystack, const_string needle); -#endif - /* If NAME has a suffix, return a pointer to its first character (i.e., the one after the `.'); otherwise, return NULL. */ extern KPSEDLL const_string find_suffix (const_string name); diff --git a/Build/source/texk/kpathsea/strcasecmp.c b/Build/source/texk/kpathsea/strcasecmp.c deleted file mode 100644 index 481a1ae45f7..00000000000 --- a/Build/source/texk/kpathsea/strcasecmp.c +++ /dev/null @@ -1,76 +0,0 @@ -/* strcasecmp.c - case-insensitive strcmp - - Copyright 2008, 2010 Karl Berry. - Copyright 1991, 1992, 1995 Free Software Foundation, Inc. - This file was part of the GNU C Library. - Modified by Karl Berry for kpathsea. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see <http://www.gnu.org/licenses/>. */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <ctype.h> - -/* Compare S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexiographically less than, - equal to or greater than S2. */ -int -strcasecmp (s1, s2) - const char *s1; - const char *s2; -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} - -int -strncasecmp (s1, s2, n) - const char *s1; - const char *s2; - unsigned n; -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2 || n == 0) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0' || c1 != c2) - return c1 - c2; - } while (--n > 0); - - return c1 - c2; -} diff --git a/Build/source/texk/kpathsea/strstr.c b/Build/source/texk/kpathsea/strstr.c deleted file mode 100644 index 4042c492872..00000000000 --- a/Build/source/texk/kpathsea/strstr.c +++ /dev/null @@ -1,121 +0,0 @@ -/* strstr.c - search for a substring in string. - - Copyright 2008, 2010 Karl Berry. - Copyright 1994, 1995 Free Software Foundation, Inc. - This file was part of the GNU C Library. - Modified for kpathsea by Karl Berry. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see <http://www.gnu.org/licenses/>. */ - -/* - * My personal strstr() implementation that beats most other algorithms. - * Until someone tells me otherwise, I assume that this is the - * fastest implementation of strstr() in C. - * I deliberately chose not to comment it. You should have at least - * as much fun trying to understand it, as I had to write it :-). - * - * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -typedef unsigned chartype; - -char * -strstr (phaystack, pneedle) - const char *phaystack; - const char *pneedle; -{ - register const unsigned char *haystack, *needle; - register chartype b, c; - - haystack = (const unsigned char *) phaystack; - needle = (const unsigned char *) pneedle; - - b = *needle; - if (b != '\0') - { - haystack--; /* possible ANSI violation */ - do - { - c = *++haystack; - if (c == '\0') - goto ret0; - } - while (c != b); - - c = *++needle; - if (c == '\0') - goto foundneedle; - ++needle; - goto jin; - - for (;;) - { - register chartype a; - register const unsigned char *rhaystack, *rneedle; - - do - { - a = *++haystack; - if (a == '\0') - goto ret0; - if (a == b) - break; - a = *++haystack; - if (a == '\0') - goto ret0; -shloop: ; - } - while (a != b); - -jin: a = *++haystack; - if (a == '\0') - goto ret0; - - if (a != c) - goto shloop; - - rhaystack = haystack-- + 1; - rneedle = needle; - a = *rneedle; - - if (*rhaystack == a) - do - { - if (a == '\0') - goto foundneedle; - ++rhaystack; - a = *++needle; - if (*rhaystack != a) - break; - if (a == '\0') - goto foundneedle; - ++rhaystack; - a = *++needle; - } - while (*rhaystack == a); - - needle = rneedle; /* took the register-poor aproach */ - - if (a == '\0') - break; - } - } -foundneedle: - return (char*) haystack; -ret0: - return 0; -} diff --git a/Build/source/texk/kpathsea/strtol.c b/Build/source/texk/kpathsea/strtol.c deleted file mode 100644 index a1864c6f7ed..00000000000 --- a/Build/source/texk/kpathsea/strtol.c +++ /dev/null @@ -1,291 +0,0 @@ -/* strtol.c - convert a string to an unsigned long int. - - Copyright 1997, 2008 Karl Berry. - Copyright 1991, 1992, 1994, 1995 Free Software Foundation, Inc. - Modified by Karl Berry for kpathsea. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see <http://www.gnu.org/licenses/>. */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#ifdef _LIBC -# define USE_NUMBER_GROUPING -# define STDC_HEADERS -# define HAVE_LIMITS_H -#endif - -#include <ctype.h> -#include <errno.h> -#ifndef errno -extern int errno; -#endif - -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - -#ifdef STDC_HEADERS -# include <stddef.h> -# include <stdlib.h> -#else -# ifndef NULL -# define NULL 0 -# endif -#endif - -#ifdef USE_NUMBER_GROUPING -# include "../locale/localeinfo.h" -#endif - -/* Nonzero if we are defining `strtoul' or `strtouq', operating on - unsigned integers. */ -#ifndef UNSIGNED -# define UNSIGNED 0 -# define INT LONG int -#else -# define strtol strtoul -# define INT unsigned LONG int -#endif - -/* If QUAD is defined, we are defining `strtoq' or `strtouq', - operating on `long long int's. */ -#ifdef QUAD -# if UNSIGNED -# define strtoul strtouq -# else -# define strtol strtoq -# endif -# define LONG long long -# undef LONG_MIN -# define LONG_MIN LONG_LONG_MIN -# undef LONG_MAX -# define LONG_MAX LONG_LONG_MAX -# undef ULONG_MAX -# define ULONG_MAX ULONG_LONG_MAX -# if __GNUC__ == 2 && __GNUC_MINOR__ < 7 - /* Work around gcc bug with using this constant. */ - static const unsigned long long int maxquad = ULONG_LONG_MAX; -# undef ULONG_MAX -# define ULONG_MAX maxquad -# endif -#else -# define LONG long -#endif - -#ifdef __STDC__ -# define INTERNAL(x) INTERNAL1(x) -# define INTERNAL1(x) __##x##_internal -#else -# define INTERNAL(x) __/**/x/**/_internal -#endif - -#ifdef USE_NUMBER_GROUPING -/* This file defines a function to check for correct grouping. */ -# include "grouping.h" -#endif - - -/* Convert NPTR to an `unsigned long int' or `long int' in base BASE. - If BASE is 0 the base is determined by the presence of a leading - zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal. - If BASE is < 2 or > 36, it is reset to 10. - If ENDPTR is not NULL, a pointer to the character after the last - one converted is stored in *ENDPTR. */ - -INT -INTERNAL (strtol) (nptr, endptr, base, group) - const char *nptr; - char **endptr; - int base; - int group; -{ - int negative; - register unsigned LONG int cutoff; - register unsigned int cutlim; - register unsigned LONG int i; - register const char *s; - register unsigned char c; - const char *save, *end; - int overflow; - -#ifdef USE_NUMBER_GROUPING - /* The thousands character of the current locale. */ - wchar_t thousands; - /* The numeric grouping specification of the current locale, - in the format described in <locale.h>. */ - const char *grouping; - - if (group) - { - grouping = _NL_CURRENT (LC_NUMERIC, GROUPING); - if (*grouping <= 0 || *grouping == CHAR_MAX) - grouping = NULL; - else - { - /* Figure out the thousands separator character. */ - if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP), - strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0) - thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP); - if (thousands == L'\0') - grouping = NULL; - } - } - else - grouping = NULL; -#endif - - if (base < 0 || base == 1 || base > 36) - base = 10; - - s = nptr; - - /* Skip white space. */ - while (isspace (*s)) - ++s; - if (*s == '\0') - goto noconv; - - /* Check for a sign. */ - if (*s == '-') - { - negative = 1; - ++s; - } - else if (*s == '+') - { - negative = 0; - ++s; - } - else - negative = 0; - - if (base == 16 && s[0] == '0' && toupper (s[1]) == 'X') - s += 2; - - /* If BASE is zero, figure it out ourselves. */ - if (base == 0) - if (*s == '0') - { - if (toupper (s[1]) == 'X') - { - s += 2; - base = 16; - } - else - base = 8; - } - else - base = 10; - - /* Save the pointer so we can check later if anything happened. */ - save = s; - -#ifdef USE_NUMBER_GROUPING - if (group) - { - /* Find the end of the digit string and check its grouping. */ - end = s; - for (c = *end; c != '\0'; c = *++end) - if (c != thousands && !isdigit (c) && - (!isalpha (c) || toupper (c) - 'A' + 10 >= base)) - break; - if (*s == thousands) - end = s; - else - end = correctly_grouped_prefix (s, end, thousands, grouping); - } - else -#endif - end = NULL; - - cutoff = ULONG_MAX / (unsigned LONG int) base; - cutlim = ULONG_MAX % (unsigned LONG int) base; - - overflow = 0; - i = 0; - for (c = *s; c != '\0'; c = *++s) - { - if (s == end) - break; - if (isdigit (c)) - c -= '0'; - else if (isalpha (c)) - c = toupper (c) - 'A' + 10; - else - break; - if (c >= base) - break; - /* Check for overflow. */ - if (i > cutoff || (i == cutoff && c > cutlim)) - overflow = 1; - else - { - i *= (unsigned LONG int) base; - i += c; - } - } - - /* Check if anything actually happened. */ - if (s == save) - goto noconv; - - /* Store in ENDPTR the address of one character - past the last character we converted. */ - if (endptr != NULL) - *endptr = (char *) s; - -#if !UNSIGNED - /* Check for a value that is within the range of - `unsigned LONG int', but outside the range of `LONG int'. */ - if (i > (negative ? - -(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX)) - overflow = 1; -#endif - - if (overflow) - { - errno = ERANGE; -#if UNSIGNED - return ULONG_MAX; -#else - return negative ? LONG_MIN : LONG_MAX; -#endif - } - - /* Return the result of the appropriate sign. */ - return (negative ? -i : i); - -noconv: - /* There was no number to convert. */ - if (endptr != NULL) - *endptr = (char *) nptr; - return 0L; -} - -/* External user entry point. */ - -#ifdef weak_symbol -weak_symbol (strtol) -#endif - -INT -strtol (nptr, endptr, base) - const char *nptr; - char **endptr; - int base; -{ - return INTERNAL (strtol) (nptr, endptr, base, 0); -} diff --git a/Build/source/texk/lcdf-typetools/autoconf.h.in b/Build/source/texk/lcdf-typetools/autoconf.h.in index 5d3c81800bd..7db5879047e 100644 --- a/Build/source/texk/lcdf-typetools/autoconf.h.in +++ b/Build/source/texk/lcdf-typetools/autoconf.h.in @@ -145,9 +145,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -169,12 +166,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 6900e18d442..ab0827edff3 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -13824,13 +13824,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/makeindexk/c-auto.in b/Build/source/texk/makeindexk/c-auto.in index fb20fd543af..cf8c0f67db5 100644 --- a/Build/source/texk/makeindexk/c-auto.in +++ b/Build/source/texk/makeindexk/c-auto.in @@ -70,9 +70,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -85,12 +82,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index b7bd55da0b9..eb0042be35d 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -13201,13 +13201,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index 00f45c3e569..b31a594a650 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop checks for strdup and strtol. + 2014-12-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp> Update for upTeX-1.20. diff --git a/Build/source/texk/makejvf/c-auto.in b/Build/source/texk/makejvf/c-auto.in index abb57d7adca..76526b1f6bb 100644 --- a/Build/source/texk/makejvf/c-auto.in +++ b/Build/source/texk/makejvf/c-auto.in @@ -61,15 +61,9 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H @@ -79,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure index 092e29564fa..b69838e9c97 100755 --- a/Build/source/texk/makejvf/configure +++ b/Build/source/texk/makejvf/configure @@ -13204,13 +13204,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi @@ -13420,18 +13419,6 @@ fi done -for ac_func in strdup strtol -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS diff --git a/Build/source/texk/makejvf/configure.ac b/Build/source/texk/makejvf/configure.ac index 3498c69f267..602ab280ef7 100644 --- a/Build/source/texk/makejvf/configure.ac +++ b/Build/source/texk/makejvf/configure.ac @@ -18,7 +18,6 @@ KPSE_COMMON([makejvfk], [no-define]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) AC_CHECK_HEADERS([strings.h]) -AC_CHECK_FUNCS([strdup strtol]) KPSE_KPATHSEA_FLAGS KPSE_PTEXENC_FLAGS diff --git a/Build/source/texk/mendexk/c-auto.in b/Build/source/texk/mendexk/c-auto.in index 2b8d1e2a73a..430e86400ab 100644 --- a/Build/source/texk/mendexk/c-auto.in +++ b/Build/source/texk/mendexk/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 38ac84fbb6b..4fd71aaeea4 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -13204,13 +13204,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/musixtnt/config.h.in b/Build/source/texk/musixtnt/config.h.in index 69e6720c9fa..4525f384e34 100644 --- a/Build/source/texk/musixtnt/config.h.in +++ b/Build/source/texk/musixtnt/config.h.in @@ -64,9 +64,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -79,12 +76,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/musixtnt/configure b/Build/source/texk/musixtnt/configure index 9e179454df4..e94d521bc4d 100755 --- a/Build/source/texk/musixtnt/configure +++ b/Build/source/texk/musixtnt/configure @@ -13209,13 +13209,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/ps2pk/c-auto.in b/Build/source/texk/ps2pk/c-auto.in index e5814cef018..7a40fd65daa 100644 --- a/Build/source/texk/ps2pk/c-auto.in +++ b/Build/source/texk/ps2pk/c-auto.in @@ -73,9 +73,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -88,12 +85,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/ps2pk/configure b/Build/source/texk/ps2pk/configure index 5bc2107ed99..a8706105472 100755 --- a/Build/source/texk/ps2pk/configure +++ b/Build/source/texk/ps2pk/configure @@ -13200,13 +13200,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/psutils/config.h.in b/Build/source/texk/psutils/config.h.in index 821d973501c..01abb3171c7 100644 --- a/Build/source/texk/psutils/config.h.in +++ b/Build/source/texk/psutils/config.h.in @@ -64,9 +64,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -79,12 +76,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure index 450ba577543..3c78bbe532d 100755 --- a/Build/source/texk/psutils/configure +++ b/Build/source/texk/psutils/configure @@ -13226,13 +13226,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/ptexenc/c-auto.in b/Build/source/texk/ptexenc/c-auto.in index eaefdf80787..97516fba974 100644 --- a/Build/source/texk/ptexenc/c-auto.in +++ b/Build/source/texk/ptexenc/c-auto.in @@ -84,9 +84,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -99,12 +96,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 796c27d2c68..bf095ce54e5 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -13217,13 +13217,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/seetexk/config.h.in b/Build/source/texk/seetexk/config.h.in index e265e48f4ad..7d6c87602ba 100644 --- a/Build/source/texk/seetexk/config.h.in +++ b/Build/source/texk/seetexk/config.h.in @@ -64,9 +64,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -82,12 +79,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure index 4d29389c20d..21548eb9112 100755 --- a/Build/source/texk/seetexk/configure +++ b/Build/source/texk/seetexk/configure @@ -13208,13 +13208,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/tex4htk/c-auto.in b/Build/source/texk/tex4htk/c-auto.in index e5779bf653e..13fd63217fb 100644 --- a/Build/source/texk/tex4htk/c-auto.in +++ b/Build/source/texk/tex4htk/c-auto.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index cb56582eec6..3c5f8a7109f 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -13396,13 +13396,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/ttf2pk2/config.h.in b/Build/source/texk/ttf2pk2/config.h.in index 3dc100972c5..62635d2a346 100644 --- a/Build/source/texk/ttf2pk2/config.h.in +++ b/Build/source/texk/ttf2pk2/config.h.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index 47e1b6057a1..5e7ba62d914 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -13218,13 +13218,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/ttfdump/config.h.in b/Build/source/texk/ttfdump/config.h.in index f0306d41128..d51c70af751 100644 --- a/Build/source/texk/ttfdump/config.h.in +++ b/Build/source/texk/ttfdump/config.h.in @@ -61,9 +61,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -76,12 +73,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure index 6f209fb95ce..79d1e870d9a 100755 --- a/Build/source/texk/ttfdump/configure +++ b/Build/source/texk/ttfdump/configure @@ -13391,13 +13391,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index a260ee0d914..c18e27888f1 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * w2c/config.h: Drop the strtol() prototype. + 2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Initialize {EXTRA,lib}_{,LT}LIBRARIES. diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index 33beb7bf8b1..54ce2c40044 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -153,9 +153,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -180,12 +177,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if you have the <StructTreeRoot.h> header file. */ #undef HAVE_STRUCTTREEROOT_H diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 46f81e58059..eac71aa0320 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -14066,13 +14066,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h index 25ba9b7f559..ab76a1b5794 100644 --- a/Build/source/texk/web2c/w2c/config.h +++ b/Build/source/texk/web2c/w2c/config.h @@ -1,6 +1,7 @@ /* w2c/config.h: All .c files include this first. -Copyright 1995, 1996, 2006, 2007, 2009, 2010, 2012, 2014 Karl Berry. +Copyright 1995, 1996, 2006, 2007, 2009, 2010, 2012, 2014, + 2015 Karl Berry. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -126,11 +127,6 @@ typedef unsigned long uintptr_t; #define WIN32WIN #endif -/* strtol.c */ -#ifndef HAVE_STRTOL -extern long strtol (const char *, char **, int); -#endif - #if defined __GNUC__ && __GNUC__ >=3 #define WEB2C_NORETURN __attribute__((__noreturn__)) #else diff --git a/Build/source/texk/web2c/web2c/c-auto.in b/Build/source/texk/web2c/web2c/c-auto.in index 014d6241bf7..e198ab43076 100644 --- a/Build/source/texk/web2c/web2c/c-auto.in +++ b/Build/source/texk/web2c/web2c/c-auto.in @@ -64,9 +64,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -82,12 +79,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure index 7947eca8a39..7b42263ef13 100755 --- a/Build/source/texk/web2c/web2c/configure +++ b/Build/source/texk/web2c/web2c/configure @@ -13391,13 +13391,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi diff --git a/Build/source/texk/xdvik/c-auto.in b/Build/source/texk/xdvik/c-auto.in index 1d94d9484ef..2955ab23382 100644 --- a/Build/source/texk/xdvik/c-auto.in +++ b/Build/source/texk/xdvik/c-auto.in @@ -189,9 +189,6 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -213,12 +210,6 @@ /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 9516db04bed..68c912815ca 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -13481,13 +13481,12 @@ fi done -for ac_func in putenv strcasecmp strtol strstr +for ac_func in putenv do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_PUTENV 1 _ACEOF fi |