--- src/Makefile.am.orig	2013-09-25 06:41:53 UTC
+++ src/Makefile.am
@@ -3,9 +3,9 @@
 lib_LTLIBRARIES = mod_authnz_crowd.la
 mod_authnz_crowd_la_SOURCES = mod_authnz_crowd.c mod_authnz_crowd.h crowd_client.c crowd_client.h cache.c cache.h util.c util.h
 mod_authnz_crowd_la_LDFLAGS = -module -lcurl `xml2-config --libs`
-AM_CFLAGS = `apr-1-config --cflags`
+AM_CFLAGS = `apr-1-config --cflags | sed -e 's/O[[:digit:]]/O1/'`
 AM_CPPFLAGS = -I@APACHE_INCLUDE_DIR@ `apr-1-config --cppflags --includes` `xml2-config --cflags`
-CFLAGS=-g -Wmissing-prototypes -O1   # -O2 causes mysterious crashes
+#CFLAGS=-g -Wmissing-prototypes -O1   # -O2 causes mysterious crashes
 TESTS = test.py
 TESTS_ENVIRONMENT = APACHE_BIN_DIR=@APACHE_BIN_DIR@
 
@@ -18,11 +18,6 @@
 	APACHE_MODULES_DIR=@APACHE_MODULES_DIR@ CURDIR=$(CURDIR) envsubst < httpd/conf/httpd_svn.conf.in > httpd/conf/httpd_svn.conf
 
 install:
-	cp @HTTPD_CONF@ /tmp/httpd.conf.bak
-	@APXS@ -i -a mod_authnz_crowd.la
-	@APXS@ -e -a -n dav_svn modules/mod_dav_svn.so
-	@APXS@ -i -a svn/mod_authz_svn_crowd.la
-	if [ -e /etc/apache2/mods-enabled/dav.load ]; then mv /etc/apache2/mods-enabled/dav.load /etc/apache2/mods-enabled/1dav.load; fi
-	if [ -e /etc/apache2/mods-enabled/dav_svn.load ]; then mv /etc/apache2/mods-enabled/dav_svn.load /etc/apache2/mods-enabled/1dav_svn.load; fi
-	@APACHECTL@ configtest || mv /tmp/httpd.conf.bak @HTTPD_CONF@
-	@APACHECTL@ graceful
+	@APXS@ @APXS_STAGE@ -i mod_authnz_crowd.la
+	@APXS@ @APXS_STAGE@ -e -n dav_svn modules/mod_dav_svn.so
+	@APXS@ @APXS_STAGE@ -i svn/mod_authz_svn_crowd.la