Automated merge.

[wget] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9503ff6b7848a2bab760e6a803e5d3994decffd4..2cd623b1fd64bf3b35dac8d084cccf2d41a796f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_AIX
 gl_EARLY
+md5_EARLY
 
 AC_PROG_RANLIB
 
@@ -338,9 +339,14 @@ 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.])
 fi
-AC_DEFINE([HAVE_MD5], 1, [Define if we're compiling support for MD5.])
 
 dnl **********************************************************************
 dnl Checks for IPv6
@@ -457,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