From 429820b180ffd5e43028722e36b013bad6c215ac Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 23 Feb 2013 19:51:05 +0100 Subject: [PATCH] strcasestr: remove check for this unused function --- configure.ac | 1 - lib/config-symbian.h | 3 -- lib/config-vxworks.h | 3 -- m4/curl-functions.m4 | 86 -------------------------------------------- 4 files changed, 93 deletions(-) diff --git a/configure.ac b/configure.ac index baacf9fad..d77cfe0ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3039,7 +3039,6 @@ CURL_CHECK_FUNC_SIGSETJMP CURL_CHECK_FUNC_SOCKET CURL_CHECK_FUNC_SOCKETPAIR CURL_CHECK_FUNC_STRCASECMP -CURL_CHECK_FUNC_STRCASESTR CURL_CHECK_FUNC_STRCMPI CURL_CHECK_FUNC_STRDUP CURL_CHECK_FUNC_STRERROR_R diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 754319f94..17d92b061 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -504,9 +504,6 @@ /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define to 1 if you have the `strcasestr' function. */ -#define HAVE_STRCASESTR 1 - /* Define to 1 if you have the `strcmpi' function. */ /* #undef HAVE_STRCMPI */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index ab128768a..c94534afb 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -571,9 +571,6 @@ /* Define to 1 if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 -/* Define to 1 if you have the strcasestr function. */ -/* #undef HAVE_STRCASESTR */ - /* Define to 1 if you have the strcmpi function. */ /* #undef HAVE_STRCMPI */ diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index d3bff078d..fdf004b8e 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -5867,92 +5867,6 @@ AC_DEFUN([CURL_CHECK_FUNC_STRCASECMP], [ fi ]) - -dnl CURL_CHECK_FUNC_STRCASESTR -dnl ------------------------------------------------- -dnl Verify if strcasestr is available, prototyped, and -dnl can be compiled. If all of these are true, and -dnl usage has not been previously disallowed with -dnl shell variable curl_disallow_strcasestr, then -dnl HAVE_STRCASESTR will be defined. - -AC_DEFUN([CURL_CHECK_FUNC_STRCASESTR], [ - AC_REQUIRE([CURL_INCLUDES_STRING])dnl - # - tst_links_strcasestr="unknown" - tst_proto_strcasestr="unknown" - tst_compi_strcasestr="unknown" - tst_allow_strcasestr="unknown" - # - AC_MSG_CHECKING([if strcasestr can be linked]) - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([strcasestr]) - ],[ - AC_MSG_RESULT([yes]) - tst_links_strcasestr="yes" - ],[ - AC_MSG_RESULT([no]) - tst_links_strcasestr="no" - ]) - # - if test "$tst_links_strcasestr" = "yes"; then - AC_MSG_CHECKING([if strcasestr is prototyped]) - AC_EGREP_CPP([strcasestr],[ - $curl_includes_string - ],[ - AC_MSG_RESULT([yes]) - tst_proto_strcasestr="yes" - ],[ - AC_MSG_RESULT([no]) - tst_proto_strcasestr="no" - ]) - fi - # - if test "$tst_proto_strcasestr" = "yes"; then - AC_MSG_CHECKING([if strcasestr is compilable]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - $curl_includes_string - ]],[[ - if(0 != strcasestr(0, 0)) - return 1; - ]]) - ],[ - AC_MSG_RESULT([yes]) - tst_compi_strcasestr="yes" - ],[ - AC_MSG_RESULT([no]) - tst_compi_strcasestr="no" - ]) - fi - # - if test "$tst_compi_strcasestr" = "yes"; then - AC_MSG_CHECKING([if strcasestr usage allowed]) - if test "x$curl_disallow_strcasestr" != "xyes"; then - AC_MSG_RESULT([yes]) - tst_allow_strcasestr="yes" - else - AC_MSG_RESULT([no]) - tst_allow_strcasestr="no" - fi - fi - # - AC_MSG_CHECKING([if strcasestr might be used]) - if test "$tst_links_strcasestr" = "yes" && - test "$tst_proto_strcasestr" = "yes" && - test "$tst_compi_strcasestr" = "yes" && - test "$tst_allow_strcasestr" = "yes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED(HAVE_STRCASESTR, 1, - [Define to 1 if you have the strcasestr function.]) - ac_cv_func_strcasestr="yes" - else - AC_MSG_RESULT([no]) - ac_cv_func_strcasestr="no" - fi -]) - - dnl CURL_CHECK_FUNC_STRCMPI dnl ------------------------------------------------- dnl Verify if strcmpi is available, prototyped, and