From 9f8cf0e05f43546051586c58b0487a5cea9f09dd Mon Sep 17 00:00:00 2001 From: qwell Date: Tue, 27 Apr 2010 21:22:10 +0000 Subject: Merged revisions 259439 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r259439 | qwell | 2010-04-27 16:13:01 -0500 (Tue, 27 Apr 2010) | 5 lines Add gar to the check for AR for those silly OSes (Solaris) that don't have ar. autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it. This is fine, since we don't need to use anything that the configure script doesn't. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@259466 f38db490-d61c-443f-a65b-d21fe96a405b --- main/editline/Makefile.in | 2 +- main/editline/configure | 109 ++++++++++++++++++++++++--------------------- main/editline/configure.in | 2 +- 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/main/editline/Makefile.in b/main/editline/Makefile.in index 5bb097f48..112b68b64 100644 --- a/main/editline/Makefile.in +++ b/main/editline/Makefile.in @@ -4,7 +4,7 @@ OSTYPE=$(shell uname -s) define cyg_subst_sys - if uname -s | ${GREP} -qi cygwin; then \ + if uname -s | grep -i cygwin > /dev/null; then \ cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \ mv --force $@.copy $@; \ fi diff --git a/main/editline/configure b/main/editline/configure index af4523c5e..b5fc6e02c 100755 --- a/main/editline/configure +++ b/main/editline/configure @@ -1079,10 +1079,12 @@ else echo "$ac_t""no" 1>&6 fi -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 +for ac_prog in ar gar +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1086: checking for $ac_word" >&5 +echo "configure:1088: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1114,9 +1116,12 @@ else echo "$ac_t""no" 1>&6 fi +test -n "$AR" && break +done + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:1120: checking for tgetent in -ltermcap" >&5 +echo "configure:1125: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1124,7 +1129,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1162,7 +1167,7 @@ else echo "$ac_t""no" 1>&6 \ echo $ac_n "checking for tgetent in -ltinfo""... $ac_c" 1>&6 -echo "configure:1166: checking for tgetent in -ltinfo" >&5 +echo "configure:1171: checking for tgetent in -ltinfo" >&5 ac_lib_var=`echo tinfo'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1170,7 +1175,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1208,7 +1213,7 @@ else echo "$ac_t""no" 1>&6 \ echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:1212: checking for tgetent in -lcurses" >&5 +echo "configure:1217: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1216,7 +1221,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1254,7 +1259,7 @@ else echo "$ac_t""no" 1>&6 \ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:1258: checking for tgetent in -lncurses" >&5 +echo "configure:1263: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1262,7 +1267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1313,17 +1318,17 @@ for ac_hdr in termcap.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1317: checking for $ac_hdr" >&5 +echo "configure:1322: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1351,17 +1356,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1355: checking for $ac_hdr" >&5 +echo "configure:1360: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1393,17 +1398,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1397: checking for $ac_hdr" >&5 +echo "configure:1402: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1431,17 +1436,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1435: checking for $ac_hdr" >&5 +echo "configure:1440: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1480,17 +1485,17 @@ for ac_hdr in sys/cdefs.h vis.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1484: checking for $ac_hdr" >&5 +echo "configure:1489: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1520,12 +1525,12 @@ done for ac_func in issetugid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1524: checking for $ac_func" >&5 +echo "configure:1529: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1557: \"$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 @@ -1575,12 +1580,12 @@ done for ac_func in fgetln do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1579: checking for $ac_func" >&5 +echo "configure:1584: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1612: \"$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 @@ -1631,12 +1636,12 @@ done for ac_func in strvis do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1635: checking for $ac_func" >&5 +echo "configure:1640: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1668: \"$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 @@ -1687,12 +1692,12 @@ done for ac_func in strunvis do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1691: checking for $ac_func" >&5 +echo "configure:1696: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1724: \"$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 @@ -1743,12 +1748,12 @@ done for ac_func in strlcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1747: checking for $ac_func" >&5 +echo "configure:1752: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1780: \"$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 @@ -1799,12 +1804,12 @@ done for ac_func in strlcat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1803: checking for $ac_func" >&5 +echo "configure:1808: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1836: \"$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 @@ -1854,7 +1859,7 @@ done cat > conftest.$ac_ext < #ifdef __RCSID @@ -1873,7 +1878,7 @@ rm -f conftest* cat > conftest.$ac_ext < #ifdef __COPYRIGHT @@ -1892,7 +1897,7 @@ rm -f conftest* cat > conftest.$ac_ext < #ifdef __RENAME @@ -1911,7 +1916,7 @@ rm -f conftest* cat > conftest.$ac_ext < #ifdef _DIAGASSERT diff --git a/main/editline/configure.in b/main/editline/configure.in index a83eb8366..db533343d 100644 --- a/main/editline/configure.in +++ b/main/editline/configure.in @@ -76,7 +76,7 @@ esac AC_PROG_INSTALL AC_PROG_RANLIB -AC_PATH_PROG(AR, ar, , $PATH) +AC_PATH_PROGS(AR, ar gar, , $PATH) dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses. AC_CHECK_LIB(termcap, tgetent, , \ -- cgit v1.2.3