equal
deleted
inserted
replaced
47 ### |
47 ### |
48 ### Test that the generated configure is up-to-date |
48 ### Test that the generated configure is up-to-date |
49 ### |
49 ### |
50 |
50 |
51 run_autogen_or_fail() { |
51 run_autogen_or_fail() { |
52 if test "x`which autoconf 2> /dev/null`" = x; then |
52 if test "x`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" = x; then |
53 echo "Cannot locate autoconf, unable to correct situation." |
53 echo "Cannot locate autoconf, unable to correct situation." |
54 echo "Please install autoconf and run 'bash autogen.sh' to update the generated files." |
54 echo "Please install autoconf and run 'bash autogen.sh' to update the generated files." |
55 echo "Error: Cannot continue" 1>&2 |
55 echo "Error: Cannot continue" 1>&2 |
56 exit 1 |
56 exit 1 |
57 else |
57 else |
78 done |
78 done |
79 fi |
79 fi |
80 } |
80 } |
81 |
81 |
82 check_hg_updates() { |
82 check_hg_updates() { |
83 if test "x`which hg 2> /dev/null`" != x; then |
83 if test "x`which hg 2> /dev/null | grep -v '^no hg in'`" != x; then |
84 conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf` |
84 conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf` |
85 if test "x$conf_updated_autoconf_files" != x; then |
85 if test "x$conf_updated_autoconf_files" != x; then |
86 echo "Configure source code has been updated, checking time stamps" |
86 echo "Configure source code has been updated, checking time stamps" |
87 check_autoconf_timestamps |
87 check_autoconf_timestamps |
88 fi |
88 fi |