Add SHA1SUM to configure, since we require it for sounds/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@279883 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 9af5874ec7f7186a92107b838744442079cac8f7..cf4adfde5052df2fec07ed0e11d6701db98b3508 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 279609 .
+# From configure.ac Revision: 279657 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk 1.6.2.
 #
@@ -933,6 +933,8 @@ FIND
 FLEX
 BISON
 GNU_LD
+ac_ct_SHA1SUM
+SHA1SUM
 ac_ct_AR
 AR
 ac_ct_STRIP
@@ -6833,6 +6835,106 @@ esac
   fi
 fi
 
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in sha1sum
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_SHA1SUM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$SHA1SUM"; then
+  ac_cv_prog_SHA1SUM="$SHA1SUM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_SHA1SUM="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+SHA1SUM=$ac_cv_prog_SHA1SUM
+if test -n "$SHA1SUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHA1SUM" >&5
+$as_echo "$SHA1SUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$SHA1SUM" && break
+  done
+fi
+if test -z "$SHA1SUM"; then
+  ac_ct_SHA1SUM=$SHA1SUM
+  for ac_prog in sha1sum
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_SHA1SUM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_SHA1SUM"; then
+  ac_cv_prog_ac_ct_SHA1SUM="$ac_ct_SHA1SUM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_SHA1SUM="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_SHA1SUM=$ac_cv_prog_ac_ct_SHA1SUM
+if test -n "$ac_ct_SHA1SUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SHA1SUM" >&5
+$as_echo "$ac_ct_SHA1SUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_SHA1SUM" && break
+done
+
+  if test "x$ac_ct_SHA1SUM" = x; then
+    SHA1SUM="$ac_aux_dir/build_tools/sha1sum-sh"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    SHA1SUM=$ac_ct_SHA1SUM
+  fi
+fi
+
 
 GNU_LD=0
 if test "x$with_gnu_ld" = "xyes" ; then

diff --git a/configure.ac b/configure.ac
index 7e3901a6d54276616e669b31c222e29cca963b7b..160f3baa1673a45c27bdaa064aa42bf0ee3f60e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AST_CHECK_GNU_MAKE
 
 AC_CHECK_TOOLS([STRIP], [strip gstrip], :)
 AC_CHECK_TOOLS([AR], [ar gar], :)
+AC_CHECK_TOOLS([SHA1SUM], [sha1sum], $ac_aux_dir/build_tools/sha1sum-sh)
 
 GNU_LD=0
 if test "x$with_gnu_ld" = "xyes" ; then

diff --git a/makeopts.in b/makeopts.in
index 8de43afa4bfcc5bd1444fc126cfc13c6eda5e3e2..7268f752cc60293a0d211db446884b88a54aacd3 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -30,6 +30,7 @@ CATDVI=@CATDVI@
 KPATHSEA=@KPATHSEA@
 XMLSTARLET=@XMLSTARLET@
 MD5=@MD5@
+SHA1SUM=@SHA1SUM@
 
 BUILD_PLATFORM=@BUILD_PLATFORM@
 BUILD_CPU=@BUILD_CPU@