mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 19:52:48 +00:00
configure: Update script to pass if channels/h323/Makefile.in does not exist
This simply removes that check from the configure script, as r418019 removed chan_h323. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
268
configure
vendored
268
configure
vendored
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.ac Revision: 416416 .
|
# From configure.ac Revision: 417900 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.68 for asterisk trunk.
|
# Generated by GNU Autoconf 2.68 for asterisk trunk.
|
||||||
#
|
#
|
||||||
@@ -32220,8 +32220,6 @@ else
|
|||||||
touch makeopts.acbak
|
touch makeopts.acbak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile"
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mandatory modules: ${ac_mandatory_list}" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mandatory modules: ${ac_mandatory_list}" >&5
|
||||||
$as_echo_n "checking for mandatory modules: ${ac_mandatory_list}... " >&6; }
|
$as_echo_n "checking for mandatory modules: ${ac_mandatory_list}... " >&6; }
|
||||||
@@ -32791,9 +32789,6 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
|
|||||||
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
case $ac_config_files in *"
|
|
||||||
"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case $ac_config_headers in *"
|
case $ac_config_headers in *"
|
||||||
"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
|
"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
|
||||||
@@ -32802,7 +32797,6 @@ esac
|
|||||||
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
# Files that config.status was made for.
|
# Files that config.status was made for.
|
||||||
config_files="$ac_config_files"
|
|
||||||
config_headers="$ac_config_headers"
|
config_headers="$ac_config_headers"
|
||||||
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -32822,14 +32816,9 @@ Usage: $0 [OPTION]... [TAG]...
|
|||||||
do not print progress messages
|
do not print progress messages
|
||||||
-d, --debug don't remove temporary files
|
-d, --debug don't remove temporary files
|
||||||
--recheck update $as_me by reconfiguring in the same conditions
|
--recheck update $as_me by reconfiguring in the same conditions
|
||||||
--file=FILE[:TEMPLATE]
|
|
||||||
instantiate the configuration file FILE
|
|
||||||
--header=FILE[:TEMPLATE]
|
--header=FILE[:TEMPLATE]
|
||||||
instantiate the configuration header FILE
|
instantiate the configuration header FILE
|
||||||
|
|
||||||
Configuration files:
|
|
||||||
$config_files
|
|
||||||
|
|
||||||
Configuration headers:
|
Configuration headers:
|
||||||
$config_headers
|
$config_headers
|
||||||
|
|
||||||
@@ -32887,14 +32876,6 @@ do
|
|||||||
$as_echo "$ac_cs_config"; exit ;;
|
$as_echo "$ac_cs_config"; exit ;;
|
||||||
--debug | --debu | --deb | --de | --d | -d )
|
--debug | --debu | --deb | --de | --d | -d )
|
||||||
debug=: ;;
|
debug=: ;;
|
||||||
--file | --fil | --fi | --f )
|
|
||||||
$ac_shift
|
|
||||||
case $ac_optarg in
|
|
||||||
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
||||||
'') as_fn_error $? "missing file argument" ;;
|
|
||||||
esac
|
|
||||||
as_fn_append CONFIG_FILES " '$ac_optarg'"
|
|
||||||
ac_need_defaults=false;;
|
|
||||||
--header | --heade | --head | --hea )
|
--header | --heade | --head | --hea )
|
||||||
$ac_shift
|
$ac_shift
|
||||||
case $ac_optarg in
|
case $ac_optarg in
|
||||||
@@ -32963,9 +32944,6 @@ for ac_config_target in $ac_config_targets
|
|||||||
do
|
do
|
||||||
case $ac_config_target in
|
case $ac_config_target in
|
||||||
"include/asterisk/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/asterisk/autoconfig.h" ;;
|
"include/asterisk/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/asterisk/autoconfig.h" ;;
|
||||||
"build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
|
|
||||||
"makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
|
|
||||||
"channels/h323/Makefile") CONFIG_FILES="$CONFIG_FILES channels/h323/Makefile" ;;
|
|
||||||
|
|
||||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||||
esac
|
esac
|
||||||
@@ -32977,7 +32955,6 @@ done
|
|||||||
# We use the long form for the default assignment because of an extremely
|
# We use the long form for the default assignment because of an extremely
|
||||||
# bizarre bug on SunOS 4.1.3.
|
# bizarre bug on SunOS 4.1.3.
|
||||||
if $ac_need_defaults; then
|
if $ac_need_defaults; then
|
||||||
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
|
|
||||||
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
|
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -33008,164 +32985,6 @@ $debug ||
|
|||||||
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
|
||||||
ac_tmp=$tmp
|
ac_tmp=$tmp
|
||||||
|
|
||||||
# Set up the scripts for CONFIG_FILES section.
|
|
||||||
# No need to generate them if there are no CONFIG_FILES.
|
|
||||||
# This happens for instance with `./config.status config.h'.
|
|
||||||
if test -n "$CONFIG_FILES"; then
|
|
||||||
|
|
||||||
|
|
||||||
ac_cr=`echo X | tr X '\015'`
|
|
||||||
# On cygwin, bash can eat \r inside `` if the user requested igncr.
|
|
||||||
# But we know of no other shell where ac_cr would be empty at this
|
|
||||||
# point, so we can use a bashism as a fallback.
|
|
||||||
if test "x$ac_cr" = x; then
|
|
||||||
eval ac_cr=\$\'\\r\'
|
|
||||||
fi
|
|
||||||
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
|
||||||
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
|
||||||
ac_cs_awk_cr='\\r'
|
|
||||||
else
|
|
||||||
ac_cs_awk_cr=$ac_cr
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
echo "cat >conf$$subs.awk <<_ACEOF" &&
|
|
||||||
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
|
||||||
echo "_ACEOF"
|
|
||||||
} >conf$$subs.sh ||
|
|
||||||
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
||||||
ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
|
|
||||||
ac_delim='%!_!# '
|
|
||||||
for ac_last_try in false false false false false :; do
|
|
||||||
. ./conf$$subs.sh ||
|
|
||||||
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
||||||
|
|
||||||
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
|
||||||
if test $ac_delim_n = $ac_delim_num; then
|
|
||||||
break
|
|
||||||
elif $ac_last_try; then
|
|
||||||
as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
||||||
else
|
|
||||||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
rm -f conf$$subs.sh
|
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
||||||
cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
|
|
||||||
_ACEOF
|
|
||||||
sed -n '
|
|
||||||
h
|
|
||||||
s/^/S["/; s/!.*/"]=/
|
|
||||||
p
|
|
||||||
g
|
|
||||||
s/^[^!]*!//
|
|
||||||
:repl
|
|
||||||
t repl
|
|
||||||
s/'"$ac_delim"'$//
|
|
||||||
t delim
|
|
||||||
:nl
|
|
||||||
h
|
|
||||||
s/\(.\{148\}\)..*/\1/
|
|
||||||
t more1
|
|
||||||
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
|
||||||
p
|
|
||||||
n
|
|
||||||
b repl
|
|
||||||
:more1
|
|
||||||
s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
||||||
p
|
|
||||||
g
|
|
||||||
s/.\{148\}//
|
|
||||||
t nl
|
|
||||||
:delim
|
|
||||||
h
|
|
||||||
s/\(.\{148\}\)..*/\1/
|
|
||||||
t more2
|
|
||||||
s/["\\]/\\&/g; s/^/"/; s/$/"/
|
|
||||||
p
|
|
||||||
b
|
|
||||||
:more2
|
|
||||||
s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
|
||||||
p
|
|
||||||
g
|
|
||||||
s/.\{148\}//
|
|
||||||
t delim
|
|
||||||
' <conf$$subs.awk | sed '
|
|
||||||
/^[^""]/{
|
|
||||||
N
|
|
||||||
s/\n//
|
|
||||||
}
|
|
||||||
' >>$CONFIG_STATUS || ac_write_fail=1
|
|
||||||
rm -f conf$$subs.awk
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
||||||
_ACAWK
|
|
||||||
cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
|
|
||||||
for (key in S) S_is_set[key] = 1
|
|
||||||
FS = ""
|
|
||||||
|
|
||||||
}
|
|
||||||
{
|
|
||||||
line = $ 0
|
|
||||||
nfields = split(line, field, "@")
|
|
||||||
substed = 0
|
|
||||||
len = length(field[1])
|
|
||||||
for (i = 2; i < nfields; i++) {
|
|
||||||
key = field[i]
|
|
||||||
keylen = length(key)
|
|
||||||
if (S_is_set[key]) {
|
|
||||||
value = S[key]
|
|
||||||
line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
|
|
||||||
len += length(value) + length(field[++i])
|
|
||||||
substed = 1
|
|
||||||
} else
|
|
||||||
len += 1 + keylen
|
|
||||||
}
|
|
||||||
|
|
||||||
print line
|
|
||||||
}
|
|
||||||
|
|
||||||
_ACAWK
|
|
||||||
_ACEOF
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
||||||
if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
|
||||||
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
|
||||||
else
|
|
||||||
cat
|
|
||||||
fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|
|
||||||
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
|
|
||||||
# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
|
|
||||||
# trailing colons and then remove the whole line if VPATH becomes empty
|
|
||||||
# (actually we leave an empty line to preserve line numbers).
|
|
||||||
if test "x$srcdir" = x.; then
|
|
||||||
ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
|
|
||||||
h
|
|
||||||
s///
|
|
||||||
s/^/:/
|
|
||||||
s/[ ]*$/:/
|
|
||||||
s/:\$(srcdir):/:/g
|
|
||||||
s/:\${srcdir}:/:/g
|
|
||||||
s/:@srcdir@:/:/g
|
|
||||||
s/^:*//
|
|
||||||
s/:*$//
|
|
||||||
x
|
|
||||||
s/\(=[ ]*\).*/\1/
|
|
||||||
G
|
|
||||||
s/\n//
|
|
||||||
s/^[^=]*=[ ]*$//
|
|
||||||
}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
||||||
fi # test -n "$CONFIG_FILES"
|
|
||||||
|
|
||||||
# Set up the scripts for CONFIG_HEADERS section.
|
# Set up the scripts for CONFIG_HEADERS section.
|
||||||
# No need to generate them if there are no CONFIG_HEADERS.
|
# No need to generate them if there are no CONFIG_HEADERS.
|
||||||
# This happens for instance with `./config.status Makefile'.
|
# This happens for instance with `./config.status Makefile'.
|
||||||
@@ -33275,7 +33094,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||||||
fi # test -n "$CONFIG_HEADERS"
|
fi # test -n "$CONFIG_HEADERS"
|
||||||
|
|
||||||
|
|
||||||
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
|
eval set X " :H $CONFIG_HEADERS "
|
||||||
shift
|
shift
|
||||||
for ac_tag
|
for ac_tag
|
||||||
do
|
do
|
||||||
@@ -33404,90 +33223,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
|||||||
|
|
||||||
|
|
||||||
case $ac_mode in
|
case $ac_mode in
|
||||||
:F)
|
|
||||||
#
|
|
||||||
# CONFIG_FILE
|
|
||||||
#
|
|
||||||
|
|
||||||
case $INSTALL in
|
|
||||||
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
|
||||||
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
|
|
||||||
esac
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
||||||
# If the template does not know about datarootdir, expand it.
|
|
||||||
# FIXME: This hack should be removed a few years after 2.60.
|
|
||||||
ac_datarootdir_hack=; ac_datarootdir_seen=
|
|
||||||
ac_sed_dataroot='
|
|
||||||
/datarootdir/ {
|
|
||||||
p
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/@datadir@/p
|
|
||||||
/@docdir@/p
|
|
||||||
/@infodir@/p
|
|
||||||
/@localedir@/p
|
|
||||||
/@mandir@/p'
|
|
||||||
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
|
||||||
*datarootdir*) ac_datarootdir_seen=yes;;
|
|
||||||
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
||||||
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
|
||||||
_ACEOF
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
||||||
ac_datarootdir_hack='
|
|
||||||
s&@datadir@&$datadir&g
|
|
||||||
s&@docdir@&$docdir&g
|
|
||||||
s&@infodir@&$infodir&g
|
|
||||||
s&@localedir@&$localedir&g
|
|
||||||
s&@mandir@&$mandir&g
|
|
||||||
s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
||||||
esac
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
# Neutralize VPATH when `$srcdir' = `.'.
|
|
||||||
# Shell code in configure.ac might set extrasub.
|
|
||||||
# FIXME: do we really want to maintain this feature?
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
||||||
ac_sed_extra="$ac_vpsub
|
|
||||||
$extrasub
|
|
||||||
_ACEOF
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
||||||
:t
|
|
||||||
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
||||||
s|@configure_input@|$ac_sed_conf_input|;t t
|
|
||||||
s&@top_builddir@&$ac_top_builddir_sub&;t t
|
|
||||||
s&@top_build_prefix@&$ac_top_build_prefix&;t t
|
|
||||||
s&@srcdir@&$ac_srcdir&;t t
|
|
||||||
s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
|
||||||
s&@top_srcdir@&$ac_top_srcdir&;t t
|
|
||||||
s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
|
||||||
s&@builddir@&$ac_builddir&;t t
|
|
||||||
s&@abs_builddir@&$ac_abs_builddir&;t t
|
|
||||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
|
||||||
s&@INSTALL@&$ac_INSTALL&;t t
|
|
||||||
$ac_datarootdir_hack
|
|
||||||
"
|
|
||||||
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
|
|
||||||
>$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
||||||
|
|
||||||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
|
||||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
|
|
||||||
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
|
|
||||||
"$ac_tmp/out"`; test -z "$ac_out"; } &&
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
||||||
which seems to be undefined. Please make sure it is defined" >&5
|
|
||||||
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
||||||
which seems to be undefined. Please make sure it is defined" >&2;}
|
|
||||||
|
|
||||||
rm -f "$ac_tmp/stdin"
|
|
||||||
case $ac_file in
|
|
||||||
-) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
|
|
||||||
*) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
|
|
||||||
esac \
|
|
||||||
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
|
|
||||||
;;
|
|
||||||
:H)
|
:H)
|
||||||
#
|
#
|
||||||
# CONFIG_HEADER
|
# CONFIG_HEADER
|
||||||
|
@@ -2453,7 +2453,6 @@ else
|
|||||||
touch makeopts.acbak
|
touch makeopts.acbak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
|
|
||||||
AST_CHECK_MANDATORY
|
AST_CHECK_MANDATORY
|
||||||
|
|
||||||
if test -f build_tools/menuselect-deps; then
|
if test -f build_tools/menuselect-deps; then
|
||||||
|
Reference in New Issue
Block a user