[Fedora-directory-commits] adminserver/m4 httpd.m4,1.4,1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/m4

Modified Files:
	httpd.m4 
Log Message:
Resolves: #203999
Summary: HP-UX: mime.types is not in /etc. (comment #5)
Description: Introducing httpdconfdir to httpd.conf.in, which is going to be 
replaced with the parent directory of the httpd.conf full-path if the 
directory has mime.types   (for HP-UX).  Otherwise, check /etc if mime.types 
is located in the directory (for RHELs and Solaris).	If mime.types is not 
found in the both directories, issue an error.



Index: httpd.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/httpd.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.m4	22 Jun 2007 01:34:20 -0000	1.4
+++ httpd.m4	31 Jul 2007 00:19:22 -0000	1.5
@@ -66,6 +66,15 @@
     mimemagic=${httpd_root}/${mimemagic}
 fi
 
+# check for mime.types file
+httpdconfdir=`dirname $httpdconf`
+if test ! -f $httpdconfdir/mime.types ; then
+    httpdconfdir="/etc"
+    if test ! -f $httpdconfdir/mime.types ; then
+        AC_MSG_ERROR([mime.types file not found])
+    fi
+fi
+
 # check for --with-apxs
 AC_MSG_CHECKING(for --with-apxs)
 AC_ARG_WITH(apxs,