From 6b4d44ff0b01421e764cc8a2c9bf62e08ceea9fb Mon Sep 17 00:00:00 2001
From: Micah Cowan <micah@cowan.name>
Date: Fri, 7 Dec 2007 22:24:03 -0800
Subject: [PATCH] Finish integration of libmd5.

---
 .hgignore       | 4 +++-
 Makefile.am     | 2 +-
 configure.ac    | 6 +++++-
 src/ChangeLog   | 5 +++++
 src/Makefile.am | 4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.hgignore b/.hgignore
index 3922d274..27a90f5e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,4 +1,3 @@
-
 # Automatically generated by `hgimportsvn`
 syntax:glob
 .svn
@@ -18,6 +17,9 @@ lib/unistd.h
 lib/stdbool.h
 lib/stdint.h
 lib/wchar.h
+md5/.deps
+md5/*.o
+md5/libmd5.a
 tests/WgetTest.pm
 tests/unit-tests
 tests/*.o
diff --git a/Makefile.am b/Makefile.am
index cf0c98fd..964b2e51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@
 ACLOCAL_AMFLAGS = -I m4 -I md5/m4
 
 # subdirectories in the distribution
-SUBDIRS = lib md5 src doc po tests util windows
+SUBDIRS = lib @MD5_SUBDIR@ src doc po tests util windows
 
 test: all
 	cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
diff --git a/configure.ac b/configure.ac
index 1bce3f41..2cd623b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,10 @@ then
     found_md5=yes
     AC_MSG_NOTICE([using the built-in (GNU) MD5 implementation])
     AC_C_BIGENDIAN
+
+    AC_SUBST(MD5_CPPFLAGS, '-I $(top_srcdir)/md5')
+    AC_SUBST(MD5_LDADD, '../md5/libmd5.a')
+    AC_SUBST(MD5_SUBDIR, md5)
     md5_INIT
   fi
   AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.])
@@ -459,6 +463,6 @@ dnl Create output
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
                  po/Makefile.in tests/Makefile tests/WgetTest.pm
-                 lib/Makefile windows/Makefile])
+                 lib/Makefile md5/Makefile windows/Makefile])
 AC_CONFIG_HEADERS([src/config.h])
 AC_OUTPUT
diff --git a/src/ChangeLog b/src/ChangeLog
index 42c8cec4..39045d96 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-07  Micah Cowan  <micah@cowan.name>
+
+	* Makefile.am: Plug in vars to include stuff from
+	$(top_srcdir)/md5 when appropriate.
+
 2007-12-05  Micah Cowan  <micah@cowan.name>
 
 	* utils.c (subdir_p): Handle the case where d1 is "".
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d327015..e3816fae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,8 +47,8 @@ wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c	\
 	       spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
 nodist_wget_SOURCES = version.c
 EXTRA_wget_SOURCES = mswindows.c
-LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a
-AM_CPPFLAGS = -I$(top_srcdir)/lib
+LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
+AM_CPPFLAGS = -I $(top_srcdir)/lib @MD5_CPPFLAGS@
 
 version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
 	echo 'const char *version_string = "@VERSION@"' > $@
-- 
2.39.2