mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
ast_pkgconfig.m4: AST_PKG_CONFIG_CHECK() relies on sed.
Make sure that we have a working sed before trying to use it. ASTERISK-30059 #close Change-Id: I9abad67a5df11b665d480feec304ab9d6f55cc76
This commit is contained in:
Sean Bright
committed by
Friendly Automation
Friendly Automation
parent
4bf2473ac4
commit
a6c7524e0d
@@ -2,6 +2,7 @@
|
|||||||
# AST_PKG_CONFIG_CHECK([package], [component])
|
# AST_PKG_CONFIG_CHECK([package], [component])
|
||||||
AC_DEFUN([AST_PKG_CONFIG_CHECK],
|
AC_DEFUN([AST_PKG_CONFIG_CHECK],
|
||||||
[
|
[
|
||||||
|
AC_REQUIRE([AST_PROG_SED])dnl
|
||||||
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
|
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
|
||||||
PKG_CHECK_MODULES($1, $2, [
|
PKG_CHECK_MODULES($1, $2, [
|
||||||
PBX_$1=1
|
PBX_$1=1
|
||||||
|
|||||||
152
menuselect/configure
vendored
152
menuselect/configure
vendored
@@ -657,9 +657,9 @@ PBX_GTK2
|
|||||||
GTK2_LIBS
|
GTK2_LIBS
|
||||||
GTK2_CFLAGS
|
GTK2_CFLAGS
|
||||||
CONFIG_LIBXML2
|
CONFIG_LIBXML2
|
||||||
SED
|
|
||||||
LIBXML2_LIBS
|
LIBXML2_LIBS
|
||||||
LIBXML2_CFLAGS
|
LIBXML2_CFLAGS
|
||||||
|
SED
|
||||||
HAVE_NCURSES_SUBDIR
|
HAVE_NCURSES_SUBDIR
|
||||||
PBX_TINFO
|
PBX_TINFO
|
||||||
TINFO_DIR
|
TINFO_DIR
|
||||||
@@ -4945,6 +4945,81 @@ fi
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
||||||
|
printf %s "checking for a sed that does not truncate output... " >&6; }
|
||||||
|
if test ${ac_cv_path_SED+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
||||||
|
for ac_i in 1 2 3 4 5 6 7; do
|
||||||
|
ac_script="$ac_script$as_nl$ac_script"
|
||||||
|
done
|
||||||
|
echo "$ac_script" | sed 99q >conftest.sed
|
||||||
|
$as_unset ac_script || ac_script=
|
||||||
|
if test -z "$SED"; then
|
||||||
|
ac_path_SED_found=false
|
||||||
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
case $as_dir in #(((
|
||||||
|
'') as_dir=./ ;;
|
||||||
|
*/) ;;
|
||||||
|
*) as_dir=$as_dir/ ;;
|
||||||
|
esac
|
||||||
|
for ac_prog in sed gsed
|
||||||
|
do
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
|
||||||
|
as_fn_executable_p "$ac_path_SED" || continue
|
||||||
|
# Check for GNU ac_path_SED and select it if it is found.
|
||||||
|
# Check for GNU $ac_path_SED
|
||||||
|
case `"$ac_path_SED" --version 2>&1` in
|
||||||
|
*GNU*)
|
||||||
|
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
||||||
|
*)
|
||||||
|
ac_count=0
|
||||||
|
printf %s 0123456789 >"conftest.in"
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||||
|
mv "conftest.tmp" "conftest.in"
|
||||||
|
cp "conftest.in" "conftest.nl"
|
||||||
|
printf "%s\n" '' >> "conftest.nl"
|
||||||
|
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||||
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||||
|
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||||||
|
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
||||||
|
# Best one so far, save it but keep looking for a better one
|
||||||
|
ac_cv_path_SED="$ac_path_SED"
|
||||||
|
ac_path_SED_max=$ac_count
|
||||||
|
fi
|
||||||
|
# 10*(2^10) chars as input seems more than enough
|
||||||
|
test $ac_count -gt 10 && break
|
||||||
|
done
|
||||||
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
$ac_path_SED_found && break 3
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
if test -z "$ac_cv_path_SED"; then
|
||||||
|
as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
ac_cv_path_SED=$SED
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
|
||||||
|
printf "%s\n" "$ac_cv_path_SED" >&6; }
|
||||||
|
SED="$ac_cv_path_SED"
|
||||||
|
rm -f conftest.sed
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
|
if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
|
||||||
|
|
||||||
@@ -5033,81 +5108,6 @@ printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
|
||||||
printf %s "checking for a sed that does not truncate output... " >&6; }
|
|
||||||
if test ${ac_cv_path_SED+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
||||||
for ac_i in 1 2 3 4 5 6 7; do
|
|
||||||
ac_script="$ac_script$as_nl$ac_script"
|
|
||||||
done
|
|
||||||
echo "$ac_script" | sed 99q >conftest.sed
|
|
||||||
$as_unset ac_script || ac_script=
|
|
||||||
if test -z "$SED"; then
|
|
||||||
ac_path_SED_found=false
|
|
||||||
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_prog in sed gsed
|
|
||||||
do
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
|
|
||||||
as_fn_executable_p "$ac_path_SED" || continue
|
|
||||||
# Check for GNU ac_path_SED and select it if it is found.
|
|
||||||
# Check for GNU $ac_path_SED
|
|
||||||
case `"$ac_path_SED" --version 2>&1` in
|
|
||||||
*GNU*)
|
|
||||||
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
|
||||||
*)
|
|
||||||
ac_count=0
|
|
||||||
printf %s 0123456789 >"conftest.in"
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
||||||
mv "conftest.tmp" "conftest.in"
|
|
||||||
cp "conftest.in" "conftest.nl"
|
|
||||||
printf "%s\n" '' >> "conftest.nl"
|
|
||||||
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
||||||
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
||||||
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
||||||
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
|
||||||
# Best one so far, save it but keep looking for a better one
|
|
||||||
ac_cv_path_SED="$ac_path_SED"
|
|
||||||
ac_path_SED_max=$ac_count
|
|
||||||
fi
|
|
||||||
# 10*(2^10) chars as input seems more than enough
|
|
||||||
test $ac_count -gt 10 && break
|
|
||||||
done
|
|
||||||
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
$ac_path_SED_found && break 3
|
|
||||||
done
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
if test -z "$ac_cv_path_SED"; then
|
|
||||||
as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ac_cv_path_SED=$SED
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
|
|
||||||
printf "%s\n" "$ac_cv_path_SED" >&6; }
|
|
||||||
SED="$ac_cv_path_SED"
|
|
||||||
rm -f conftest.sed
|
|
||||||
|
|
||||||
|
|
||||||
if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
|
if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
|
||||||
PBX_LIBXML2=0
|
PBX_LIBXML2=0
|
||||||
|
|||||||
Reference in New Issue
Block a user