From 31bc540962d8e52939f5dfddba02bb54a39e403d Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Fri, 1 Jun 2007 13:41:28 +0000
Subject: make distcheck fixes

---
 Makefile.am          |  8 ++++++--
 apache1x/Makefile.am | 33 +++++++++++++++++++++++++++++++++
 apache1x/Makefile.in | 31 -------------------------------
 apache2x/Makefile.am | 32 ++++++++++++++++++++++++++++++++
 apache2x/Makefile.in | 30 ------------------------------
 configure.in         |  2 ++
 6 files changed, 73 insertions(+), 63 deletions(-)
 create mode 100644 apache1x/Makefile.am
 delete mode 100644 apache1x/Makefile.in
 create mode 100644 apache2x/Makefile.am
 delete mode 100644 apache2x/Makefile.in

diff --git a/Makefile.am b/Makefile.am
index a4b422b..ac0e3d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 
-EXTRA_DIST = apache1x apache2x common config.sub acsite.m4 COPYING-DAEMON
-SUBDIRS = daemon doc tools java
+if MANUAL_BUILD
+APACHE_DIR = apache1x apache2x
+endif
+
+EXTRA_DIST = common config.sub acsite.m4 COPYING-DAEMON
+SUBDIRS = daemon doc tools java $(APACHE_DIR)
 
 dist-hook:
 	rm -rf `find $(distdir)/ -name .svn`
diff --git a/apache1x/Makefile.am b/apache1x/Makefile.am
new file mode 100644
index 0000000..d043935
--- /dev/null
+++ b/apache1x/Makefile.am
@@ -0,0 +1,33 @@
+
+EXTRA_DIST = mod_httpauth.c
+
+DEF=
+INC=-I../ -I../common/
+
+all: mod_httpauth.so
+
+
+mod_httpauth.so: mod_httpauth.c ../common/sock_any.c
+	@APXS@ -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
+
+#   install the DSO file into the Apache installation
+#   and activate it in the Apache configuration
+install: all
+	@APXS@ -i -a -n 'httpauth' mod_httpauth.so
+
+#   cleanup
+clean:
+	-rm -f mod_httpauth.o mod_httpauth.so
+
+#   reload the module by installing and restarting Apache
+reload: install restart
+
+#   the general Apache start/restart/stop procedures
+start:
+	@APACHECTL@ start
+restart:
+	@APACHECTL@ restart
+stop:
+	@APACHECTL@ stop
+
+
diff --git a/apache1x/Makefile.in b/apache1x/Makefile.in
deleted file mode 100644
index 42619c7..0000000
--- a/apache1x/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DEF=
-INC=-I../ -I../common/
-
-all: mod_httpauth.so
-
-
-mod_httpauth.so: mod_httpauth.c ../common/sock_any.c
-	@APXS@ -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
-
-#   install the DSO file into the Apache installation
-#   and activate it in the Apache configuration
-install: all
-	@APXS@ -i -a -n 'httpauth' mod_httpauth.so
-
-#   cleanup
-clean:
-	-rm -f mod_httpauth.o mod_httpauth.so
-
-#   reload the module by installing and restarting Apache
-reload: install restart
-
-#   the general Apache start/restart/stop procedures
-start:
-	@APACHECTL@ start
-restart:
-	@APACHECTL@ restart
-stop:
-	@APACHECTL@ stop
-
-
diff --git a/apache2x/Makefile.am b/apache2x/Makefile.am
new file mode 100644
index 0000000..a1396c4
--- /dev/null
+++ b/apache2x/Makefile.am
@@ -0,0 +1,32 @@
+
+EXTRA_DIST = mod_httpauth.c
+
+DEF=
+INC=-I../ -I../common/
+
+all: mod_httpauth.so
+
+
+mod_httpauth.so: mod_httpauth.c ../common/sock_any.c
+	@APXS@ -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
+
+#   install the DSO file into the Apache installation
+#   and activate it in the Apache configuration
+install: all
+	@APXS@ -i -a -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
+
+#   cleanup
+clean:
+	-rm -f mod_httpauth.o mod_httpauth.so
+
+#   reload the module by installing and restarting Apache
+reload: install restart
+
+#   the general Apache start/restart/stop procedures
+start:
+	@APACHECTL@ start
+restart:
+	@APACHECTL@ restart
+stop:
+	@APACHECTL@ stop
+
diff --git a/apache2x/Makefile.in b/apache2x/Makefile.in
deleted file mode 100644
index 2244be8..0000000
--- a/apache2x/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-DEF=
-INC=-I../ -I../common/
-
-all: mod_httpauth.so
-
-
-mod_httpauth.so: mod_httpauth.c ../common/sock_any.c
-	@APXS@ -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
-
-#   install the DSO file into the Apache installation
-#   and activate it in the Apache configuration
-install: all
-	@APXS@ -i -a -c -Wc,-g -Wc,-O0 $(DEF) $(INC) $(LIB) mod_httpauth.c
-
-#   cleanup
-clean:
-	-rm -f mod_httpauth.o mod_httpauth.so
-
-#   reload the module by installing and restarting Apache
-reload: install restart
-
-#   the general Apache start/restart/stop procedures
-start:
-	@APACHECTL@ start
-restart:
-	@APACHECTL@ restart
-stop:
-	@APACHECTL@ stop
-
diff --git a/configure.in b/configure.in
index cc350e7..1ec8156 100644
--- a/configure.in
+++ b/configure.in
@@ -187,6 +187,8 @@ if test "$APXS" = "failed"; then
 	fi
 fi
 
+AM_CONDITIONAL(MANUAL_BUILD, false)
+
 AC_SUBST(APXS)
 
 AC_PATH_PROG(APACHECTL, apachectl, "failed")
-- 
cgit v1.2.3