<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/2dc4342ba03ede44442078d975a40908ed7f050b">https://github.com/macports/macports-base/commit/2dc4342ba03ede44442078d975a40908ed7f050b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2dc4342ba03ede44442078d975a40908ed7f050b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 23 12:12:45 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> configure: add missing AC_PROG_GREP
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Needed by src/pkg_mkindex.sh.
</span>---
configure | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 1 +
2 files changed, 73 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 5282aa3aa..c20027d7a 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -761,6 +761,7 @@ LN_S
</span> INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
<span style='display:block; white-space:pre;background:#e0ffe0;'>+GREP
</span> OBJEXT
EXEEXT
ac_ct_CC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3895,6 +3896,77 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span> ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+printf %s "checking for grep that handles long lines and -e... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if test ${ac_cv_path_GREP+y}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else case e in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e) if test -z "$GREP"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_path_GREP_found=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Loop through the user's path and test for each of PROGNAME-LIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $as_dir in #(((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '') as_dir=./ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */) ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *) as_dir=$as_dir/ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ac_prog in grep ggrep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_executable_p "$ac_path_GREP" || continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check for GNU ac_path_GREP and select it if it is found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for GNU $ac_path_GREP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+case `"$ac_path_GREP" --version 2>&1` in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*GNU*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_count=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf %s 0123456789 >"conftest.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat "conftest.in" "conftest.in" >"conftest.tmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv "conftest.tmp" "conftest.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp "conftest.in" "conftest.nl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" 'GREP' >> "conftest.nl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_arith $ac_count + 1 && ac_count=$as_val
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Best one so far, save it but keep looking for a better one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GREP="$ac_path_GREP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_path_GREP_max=$ac_count
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 10*(2^10) chars as input seems more than enough
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_count -gt 10 && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $ac_path_GREP_found && break 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$ac_cv_path_GREP"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_GREP=$GREP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+printf "%s\n" "$ac_cv_path_GREP" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GREP="$ac_cv_path_GREP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f78e9194..ab77f3746 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,6 +103,7 @@ esac
</span>
# Checks for programs.
AC_PROG_CC([clang cc gcc])
<span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_PROG_GREP
</span> AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
</pre><pre style='margin:0'>
</pre>