diff options
| author | Stef Walter <stef@memberwebs.com> | 2007-06-01 13:41:28 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2007-06-01 13:41:28 +0000 |
| commit | 31bc540962d8e52939f5dfddba02bb54a39e403d (patch) | |
| tree | 56310dc23f5b9e292c47fbf7109ff969a8c0b8c3 | |
| parent | 20cde33c0b943c77a7c9d8d5d9c3d9281a6b13a5 (diff) | |
make distcheck fixes
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | apache1x/Makefile.am (renamed from apache1x/Makefile.in) | 2 | ||||
| -rw-r--r-- | apache2x/Makefile.am (renamed from apache2x/Makefile.in) | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 12 insertions, 2 deletions
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.in b/apache1x/Makefile.am index 42619c7..d043935 100644 --- a/apache1x/Makefile.in +++ b/apache1x/Makefile.am @@ -1,4 +1,6 @@ +EXTRA_DIST = mod_httpauth.c + DEF= INC=-I../ -I../common/ diff --git a/apache2x/Makefile.in b/apache2x/Makefile.am index 2244be8..a1396c4 100644 --- a/apache2x/Makefile.in +++ b/apache2x/Makefile.am @@ -1,4 +1,6 @@ +EXTRA_DIST = mod_httpauth.c + DEF= INC=-I../ -I../common/ 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") |