Put in some install-time hackary to make sure apache looks for the correct

auth_mysql module (which is installed under different names depending on the
version).

This could have been done with configure or in boss-install.  I didn't do
the former because configure might get run before apache is installed.  I
didn't do the latter because you would have to remember to re-run configure
if you updated your mod_auth_mysql port.

apache/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2002-2007 University of Utah and the Flux Group.
+# Copyright (c) 2002-2007, 2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 #
@@ -30,8 +30,20 @@ $(INSTALL_APACHE_CONFIG)/%: %
 	$(INSTALL_DATA) $< $@
 
 
-install: httpd.conf
-	$(INSTALL_DATA) httpd.conf $(INSTALL_APACHE_CONFIG)/httpd.conf
+#
+# XXX hack, hack: need to fix the path to the auth_mysql_module
+# This could (should?) be done with configure, but apache port might
+# not be installed when we configure our software.
+#
+httpd.conf.fixed: httpd.conf
+	-@cp httpd.conf httpd.conf.fixed
+	@if [ -x /usr/local/libexec/apache/mod_auth_mysql.so ]; then \
+            sed -i "" -e '/^LoadModule auth_mysql/s/libauth/mod_auth/' httpd.conf.fixed; \
+	    echo "Updated httpd.conf"; \
+	fi
+
+install: httpd.conf.fixed
+	$(INSTALL_DATA) httpd.conf.fixed $(INSTALL_APACHE_CONFIG)/httpd.conf
 
 control-install: httpd.conf-ops
 	$(INSTALL_DATA) httpd.conf-ops $(INSTALL_APACHE_CONFIG)/httpd.conf

apache/httpd.conf.in

@@ -243,9 +243,7 @@ LoadModule usertrack_module   libexec/apache/mod_usertrack.so
 LoadModule unique_id_module   libexec/apache/mod_unique_id.so
 LoadModule setenvif_module    libexec/apache/mod_setenvif.so
 LoadModule php4_module        libexec/apache/libphp4.so
-LoadModule auth_mysql_module  libexec/apache/mod_auth_mysql.so
-# use the following for older versions of mod_auth_mysql
-#LoadModule auth_mysql_module  libexec/apache/libauth_mysql.so
+LoadModule auth_mysql_module  libexec/apache/libauth_mysql.so
 <IfDefine SSL>
 LoadModule ssl_module         libexec/apache/libssl.so
 </IfDefine>