Move libb2 source code to src/third_party

diff --git a/Makefile.in b/Makefile.in
index f96c29e7b7a632657ad9a14b661fd66d5c211879..fc98dc69dba9823cf5418c5301ee2c0d6d88a098 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,7 +117,7 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
 clean:
        rm -rf $(files_to_clean)
        [ ! -d src/third_party/zstd ] || $(MAKE) -C src/third_party/zstd/lib clean
-       [ ! -d src/libb2 ] || $(MAKE) -C src/libb2 clean
+       [ ! -d src/third_party/libb2 ] || $(MAKE) -C src/third_party/libb2 clean
 
 src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@
 
@@ -142,9 +142,9 @@ libb2_options = \
 @disable_cross@    --disable-fat \
 @disable_cross@    --disable-native
 
-src/libb2/src/.libs/libb2.a:
-       cd src/libb2 && ./configure ${libb2_options} CC="$(CC)"
-       $(MAKE) -C src/libb2 CC="$(CC)" CFLAGS="$(CFLAGS)"
+src/third_party/libb2/src/.libs/libb2.a:
+       cd src/third_party/libb2 && ./configure ${libb2_options} CC="$(CC)"
+       $(MAKE) -C src/third_party/libb2 CC="$(CC)" CFLAGS="$(CFLAGS)"
 
 .PHONY: performance
 performance: ccache$(EXEEXT)

diff --git a/configure.ac b/configure.ac
index 4217f4a02ec00203765b90a4235a7229a5dc480b..e93b0e8f213812a3f77e1775afbb19e4e0c33b62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -192,13 +192,13 @@ else
             fi
         fi
     fi
-    (cd src && tar -xzf ../${libb2_archive})
-    rm -rf src/libb2
-    mv src/libb2-${libb2_version} src/libb2
+    (cd src/third_party && tar -xzf ../../${libb2_archive})
+    rm -rf src/third_party/libb2
+    mv src/third_party/libb2-${libb2_version} src/third_party/libb2
     # try to make clang happy by changing the header guard macros
-    sed -i -e 's/__BLAKE2_H__/BLAKE2_H/' src/libb2/src/blake2.h
-    CPPFLAGS="$CPPFLAGS -I$srcdir/src/libb2/src"
-    extra_libs="$extra_libs src/libb2/src/.libs/libb2.a"
+    sed -i -e 's/__BLAKE2_H__/BLAKE2_H/' src/third_party/libb2/src/blake2.h
+    CPPFLAGS="$CPPFLAGS -I$srcdir/src/third_party/libb2/src"
+    extra_libs="$extra_libs src/third_party/libb2/src/.libs/libb2.a"
 fi
 
 if test "$cross_compiling" != no -o "$host_cpu" != 'x86_64'; then