diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-04 19:51:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-04 19:51:37 +0000 |
commit | ceee1bcb7164be35d829f539e9bfa2e8874c4571 (patch) | |
tree | 0adb2b8610cf9a8d2f1144a80e03ed2ae783d43c /main/editline | |
parent | 3ed525cd1d6653e4a68b6ebf7c4bdfa32fadbdfc (diff) |
Don't check for and include strlcpy and strlcat in editline. We also include
them directly in Asterisk. For platforms that need them (like my mac), you
will get a linker error due to the functions being included twice.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81452 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/editline')
-rwxr-xr-x | main/editline/configure | 112 | ||||
-rw-r--r-- | main/editline/configure.in | 2 |
2 files changed, 0 insertions, 114 deletions
diff --git a/main/editline/configure b/main/editline/configure index 8f9075c5f..bb250aea1 100755 --- a/main/editline/configure +++ b/main/editline/configure @@ -1538,118 +1538,6 @@ else fi done -for ac_func in strlcat -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1527: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1532 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_func 1 -EOF - -else - echo "$ac_t""no" 1>&6 -CCSRCS="$CCSRCS np/strlcat.c" -fi -done - -for ac_func in strlcpy -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1583: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1588 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_func 1 -EOF - -else - echo "$ac_t""no" 1>&6 -CCSRCS="$CCSRCS np/strlcpy.c" -fi -done - for ac_func in fgetln do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 diff --git a/main/editline/configure.in b/main/editline/configure.in index 2e37d6b2a..7feebd696 100644 --- a/main/editline/configure.in +++ b/main/editline/configure.in @@ -95,8 +95,6 @@ AC_CHECK_HEADERS(termcap.h, , \ AC_CHECK_HEADERS(sys/cdefs.h vis.h) AC_CHECK_FUNCS(issetugid) -AC_CHECK_FUNCS(strlcat, , CCSRCS="$CCSRCS np/strlcat.c") -AC_CHECK_FUNCS(strlcpy, , CCSRCS="$CCSRCS np/strlcpy.c") AC_CHECK_FUNCS(fgetln, , CCSRCS="$CCSRCS np/fgetln.c") AC_CHECK_FUNCS(strvis, , CCSRCS="$CCSRCS np/vis.c") AC_CHECK_FUNCS(strunvis, , CCSRCS="$CCSRCS np/unvis.c") |