- Moved CGI specific lines from configure.in to sapi/cgi/config9.m4

  which is 'executed' last of the SAPI config.m4's.
- Added --disable-cgi option. (was possible only with above change)
- Made the sed check to not test for the possibly working sed on Solaris
  since that would make the test quite useless. (compile would still fail)

# That sed check is not enabled yet..need to know whether we fail
# during configure or just put out a warning about possible non-working
# sed. As even plain ./configure doesn't work in most cases, I think
# it would be better to just fail during configure and let the users
# fix their paths/install GNU sed.

1 files changed, 2 insertions, 2 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 1f32e375c8..dc193d341a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1777,9 +1777,8 @@ $debug ||
 }
   _max=0
   _count=0
-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
   # along with /bin/sed that truncates output.
-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
+  for _sed in $_sed_list; do
     test ! -f ${_sed} && break
     cat /dev/null > "$tmp/sed.in"
     _count=0
@@ -1811,6 +1810,7 @@ if test -z "$ac_cv_path_sed"; then
   AC_MSG_ERROR([Could not find working sed on this system. Please install GNU sed.])
 else
   SED=$ac_cv_path_sed
+  PHP_SUBST(SED)
   AC_MSG_RESULT([$SED])
 fi
 ])