update apache.m4 to use -with-apxs instead of --with-apache

got SSL support to compile.
added Documentation subdirectory.

1 files changed, 3 insertions, 13 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index ca70e2f..c40a711 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,7 +3,7 @@
 # Modify these top variables.
 SUBDIRS = 
 
-EXTRA_DIST = README documentation.lyx
+EXTRA_DIST = README mysql_import_combined_log.pl
 
 #Don't modify anything below here
 
@@ -14,7 +14,7 @@ STD_DIST = Makefile.in
 
 DISTFILES = $(STD_DIST) $(EXTRA_DIST)
 
-all: $(TARGET) all-subdirs
+all: all-subdirs
 
 all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
         @otarget=`echo $@|sed s/-subdirs//`; \
@@ -36,7 +36,6 @@ include:
         ln -s @APACHE_INCDIR@ include
 
 install: install-subdirs
-        @APXS_BIN@ -i -a -n $(subst mod_,,@PACKAGE_NAME@) $(TARGET)
 
 update: update-subdirs
 
@@ -45,7 +44,7 @@ clean: clean-subdirs
 distclean: clean distclean-subdirs
         $(RM) Makefile
 
-DESTDIR = @PACKAGE_TARNAME@-@PACKAGE_VERSION@
+DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
 DESTTGZ = $(DESTDIR).tar.gz
 dist:
         @rm -rf $(DESTDIR); \
@@ -73,14 +72,5 @@ local-dist: $(DISTFILES)
         mkdir -p $(DESTDIR)
         cp -dp --parents $(DISTFILES) $(DESTDIR)
 
-$(builddir)/.deps: depend
-
-depend: $(SOURCES) $(HEADERS)
-        if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-                $(CC) -MM -MT $(TARGET) -I@APACHE_INCDIR@ $(INCLUDES) $(srcdir)/*.c > $(builddir)/.deps || true; \
-        fi
-
-include $(builddir)/.deps
-
 .PHONY: include all-subdirs update-subdirs install-subdirs \
         clean-subdirs distclean-subdirs dist