multi stuff from the multi-dev branch

diff --git a/Makefile.am b/Makefile.am
index f64d919904eff1db25d250768c999c6bfc129be4..47aa7b161f4422777e6a1d85074bf1c675924804 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST =                                          \
 
 bin_SCRIPTS = curl-config
 
-SUBDIRS = docs lib src include tests packages
+SUBDIRS = docs lib src include tests packages multi
 
 # create a root makefile in the distribution:
 dist-hook:

diff --git a/configure.in b/configure.in
index d3d9d5b5f0533f8450a4fbdf50941dbd6b38b7e2..43b80d5b1ccda61efd08aceb0339f20e62e35ce1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -597,6 +597,7 @@ AC_CONFIG_FILES([Makefile \
           include/Makefile \
           include/curl/Makefile \
           src/Makefile \
+          multi/Makefile \
            lib/Makefile \
            tests/Makefile \
            tests/data/Makefile \