Finish integration of libmd5.

diff --git a/.hgignore b/.hgignore
index 3922d274fdc6d144b7be703934fe7272fb44f1f3..27a90f5e3b877dd64c0f980aab6052bbda9bd6ab 100644 (file)
--- 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 cf0c98fd5e9e92544fb7c099dc8c1fe0b6dba00c..964b2e511e080a902602552eb7196babc116e957 100644 (file)
--- 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 1bce3f41f40f5605c9d158bf0ddbcedaa4c559aa..2cd623b1fd64bf3b35dac8d084cccf2d41a796f8 100644 (file)
--- 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 42c8cec42fb16d3bc1163b988a57db1175b4c897..39045d96c70a69b8124847da3f547b4e1cc23d3c 100644 (file)
--- 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 8d3270150c97d92e5d65849473379bbc2578944b..e3816faea38734d37096ac5125e4ee38a53c2462 100644 (file)
--- 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@"' > $@