svn commit: r326018 - /httpd/httpd/trunk/modules/generators/config5.m4

[je...@apache.org]

Author: jerenkrantz
Date: Mon Oct 17 20:25:49 2005
New Revision: 326018

URL: http://svn.apache.org/viewcvs?rev=326018&view=rev
Log:
* modules/generators/config5.m4: Improve Solaris 10 check in mod_cgid to
  know about the now-released patches that fix the AF_UNIX bugs.

Modified:
    httpd/httpd/trunk/modules/generators/config5.m4

Modified: httpd/httpd/trunk/modules/generators/config5.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/generators/config5.m4?rev=326018&r1=326017&r2=326018&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/config5.m4 (original)
+++ httpd/httpd/trunk/modules/generators/config5.m4 Mon Oct 17 20:25:49 2005
@@ -19,16 +19,34 @@
       *-solaris2*)
         case `uname -r` in
           5.10)
-          dnl Eventually, 120664 will be released for Solaris 10.
-          dnl At that point, we can do a showrev -p search for that patch.
+          dnl Does the system have the appropriate patches?
+          case `uname -p` in
+            i386)
+              patch_id="120665"
+              ;;
+            sparc)
+              patch_id="120664"
+              ;;
+            *)
+              AC_MSG_WARN([Unknown platform])
+              patch_id="120664"
+              ;;
+          esac
+          AC_MSG_CHECKING([for Solaris patch $patch_id])
+          showrev -p | grep "$patch_id" >/dev/null 2>&1
+          if test $? -eq 1; then
           dnl Solaris 11 (next release) as of snv_19 doesn't have this problem.
           dnl It may be possible to use /kernel/drv/tl from later releases.
-          AC_MSG_ERROR([mod_cgid is non-functional on Solaris 10.
-This means that threaded MPMs (such as worker MPM) with CGIs will not work.
-This problem is due to an OS bug with AF_UNIX sockets.
-Patches are forthcoming from Sun.
-Please run configure with --disable-cgid or switch to the prefork MPM.
+          AC_MSG_ERROR([Please apply either patch # 120664 (Sparc) or # 120665 (x86).
+Without these patches, mod_cgid is non-functional on Solaris 10 due to an OS
+bug with AF_UNIX sockets.
+If you can not apply these patches, you can do one of the following:
+ - run configure with --disable-cgid
+ - switch to the prefork MPM
 For more info: <http://issues.apache.org/bugzilla/show_bug.cgi?id=34264>])
+          else
+            AC_MSG_RESULT(yes)
+          fi
           ;;
         esac
         ;;