From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 23 Dec 2021 10:58:11 +0000 (+0100)
Subject: Tweak configure.in and ZSTD
X-Git-Tag: Beta-15.0.0~698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be26a92317b67715c2125069f40d0d28a1d90132;p=thirdparty%2Fbacula.git

Tweak configure.in and ZSTD
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 9a41780fb..1f4126109 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -976,6 +976,7 @@ LIBS="${saved_LIBS}"
 CFLAGS="${saved_CFLAGS}"
 
 dnl ----------------------------------------------------------------
+with_zstd_directory=no
 
 AC_ARG_WITH(zstd,
     AC_HELP_STRING([--with-zstd@<:@=DIR@:>@], [Include ZSTD support. DIR is the ZSTD base]),
@@ -1000,10 +1001,10 @@ if test "x$with_zstd_directory" != "xno"; then
          ZSTD_INC="-I$with_zstd_directory/include $ZSTD_INC"
       fi
       if test -d "$with_zstd_directory/lib"; then
-      	 ZSTD_LIBS="$with_zstd_directory/lib/libzstd.a $ZSTD_LIBS"
+      	 ZSTD_LIBS="$with_zstd_directory/lib/libzstd.a"
       fi
       if test -d "$with_zstd_directory/lib64"; then
-      	 ZSTD_LIBS="$with_zstd_directory/lib64/libzstd.a $ZSTD_LIBS"
+      	 ZSTD_LIBS="$with_zstd_directory/lib64/libzstd.a"
       fi
    fi
 
@@ -1012,7 +1013,6 @@ if test "x$with_zstd_directory" != "xno"; then
 fi
 
 AC_CHECK_HEADER(zstd.h,,[error="Can't find ZSTD header."])
-AC_CHECK_LIB(zstd,ZSTD_createCCtx,,[error="Can't find ZSTD library."])
 
 if test x"${error}" == "x"; then
     support_zstd=yes