gnome-user-share r229 - in trunk: . data

[hadess svn gnome org]

Author: hadess
Date: Tue Mar 25 15:57:39 2008
New Revision: 229
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=229&view=rev

Log:
2008-03-25  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* data/Makefile.am:
	* data/dav_user_2.2.conf.in: Allow users and distributions
	to change the default location for HTTPD modules with
	--with-modules-path=..., still defaults to /etc/httpd/modules/
	(Closes: #518647)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/data/dav_user_2.2.conf.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Mar 25 15:57:39 2008
@@ -131,11 +131,26 @@
 	
 dnl ==========================================================================
 dnl Check for SELinux
-    
+
 AC_CHECK_LIB(selinux, is_selinux_enabled, [ SELINUX_LIBS=-lselinux
   AC_DEFINE(HAVE_SELINUX,[1],[Found Selinux]) ])
 AC_SUBST(SELINUX_LIBS)
-	
+
+dnl ==========================================================================
+dnl Check for the HTTPD modules path
+
+
+
+AC_ARG_WITH([modules-path],
+	    [AS_HELP_STRING([--with-modules-path],[Path where the httpd modules are located (default: /etc/httpd/modules/)])],
+	    [with_modules_path=$withval])
+if test "x$with_modules_path" = "x" ; then
+	with_modules_path=/etc/httpd/modules/
+fi
+
+MODULES_PATH=$with_modules_path
+AC_SUBST(MODULES_PATH)
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
@@ -195,4 +210,5 @@
 
 echo "
 	httpd version:               $HTTPD_VERSION
+	httpd modules path:          $MODULES_PATH
 "

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Mar 25 15:57:39 2008
@@ -21,7 +21,8 @@
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
 
 dav_user_2.2.conf: dav_user_2.2.conf.in
-	sed "s,@DATADIR@,$(datadir)," dav_user_2.2.conf.in > $@
+	sed "s,@DATADIR@,$(datadir)," dav_user_2.2.conf.in | \
+	sed "s,@HTTP_MODULES_PATH@,$(MODULES_PATH)," > $@
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL

Modified: trunk/data/dav_user_2.2.conf.in
==============================================================================
--- trunk/data/dav_user_2.2.conf.in	(original)
+++ trunk/data/dav_user_2.2.conf.in	Tue Mar 25 15:57:39 2008
@@ -8,11 +8,11 @@
 
 LimitXMLRequestBody 100000
 
-LoadModule dav_module /etc/httpd/modules/mod_dav.so
-LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
-LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
-LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
-LoadModule authz_groupfile_module /etc/httpd/modules/mod_authz_groupfile.so
+LoadModule dav_module @HTTP_MODULES_PATH mod_dav so
+LoadModule dav_fs_module @HTTP_MODULES_PATH mod_dav_fs so
+LoadModule authn_file_module @HTTP_MODULES_PATH mod_authn_file so
+LoadModule auth_digest_module @HTTP_MODULES_PATH mod_auth_digest so
+LoadModule authz_groupfile_module @HTTP_MODULES_PATH mod_authz_groupfile so
 
 DocumentRoot ${XDG_PUBLICSHARE_DIR}
 <Directory "${XDG_PUBLICSHARE_DIR}">