Bug 2593: Compile errors on Solaris 10

diff --git a/configure.in b/configure.in
index 8ad59df006e3ef5b5c1ce62458fb675eabfe168c..94f84f70a8f948cfa4e00ceeb5ca70902268cae4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2193,10 +2193,10 @@ AC_PATH_PROG(RM, rm, $FALSE)
 AC_PATH_PROG(MV, mv, $FALSE)
 AC_PATH_PROG(MKDIR, mkdir, $FALSE)
 AC_PATH_PROG(LN, ln, cp)
-AC_PATH_PROG(PERL, perl, none)
 dnl automake handles this AC_PATH_PROG(MAKEDEPEND, makedepend, $TRUE)
-AC_PATH_PROG(AR, ar, $FALSE)
+AC_PROG_EGREP
 
+AC_PATH_PROG(PERL, perl, none)
 if test "$ac_cv_path_PERL" = "none"; then
   AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ])
 fi
@@ -2209,6 +2209,7 @@ case "$host" in
 esac
 
 dnl set $(AR)
+AC_PATH_PROG(AR, ar, $FALSE)
 AR_R="$AR r"
 case "$host" in
        *-next-nextstep3)

diff --git a/src/Makefile.am b/src/Makefile.am
index 357d44a4bda50f58251c6abc9d39fdf5547cf1c4..bfce8efc6d7a08e164d5830aee28fa90a0c61d32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1068,7 +1068,7 @@ squid.conf.documented: cf_parser.h
        true
 
 squid.conf.default: squid.conf.documented
-       grep -v -E "^[#\ ]" squid.conf.documented | grep . >squid.conf.default
+       $(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default
 
 cf_parser.h: cf.data cf_gen$(EXEEXT)
        ./cf_gen cf.data $(srcdir)/cf.data.depend