Commit b8e0f1e3 authored by Sven Hartge's avatar Sven Hartge

Refresh patches

parent 29293389
......@@ -4,15 +4,7 @@ Last-Update: 2018-12-19
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -385,6 +385,7 @@
support_smartalloc=yes
support_readline=yes
support_lzo=yes
+support_s3=yes
support_conio=yes
support_bat=no
support_tls=no
@@ -1896,6 +1897,20 @@
@@ -1897,6 +1897,20 @@
AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
......@@ -33,7 +25,7 @@ Last-Update: 2018-12-19
S3_INC=
S3_LIBS=
S3_LDFLAGS=
@@ -3641,6 +3656,7 @@
@@ -3642,6 +3656,7 @@
Encryption support: ${support_crypto}
ZLIB support: ${have_zlib}
LZO support: ${have_lzo}
......
......@@ -17,7 +17,7 @@ Last-Update: 2018-02-27
AC_PATH_PROG(QMAKE, qmake, none)
AC_PATH_PROG(GMAKE, gmake, none)
AC_PATH_PROG(PIDOF, pidof, pidof)
@@ -418,13 +421,13 @@
@@ -419,13 +422,13 @@
BAT_DIR=
if test x$support_bat = xyes; then
dnl look for Qt4
......
......@@ -2,11 +2,9 @@ Description: Honour CPPFLAGS when building gigaslam
Author: Carsten Leonhardt <leo@debian.org>
Bug: https://bugs.bacula.org/view.php?id=2438
Last-Update: 2018-11-14
diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in
index f9f6eb9..abd6619 100644
--- a/src/tools/Makefile.in
+++ b/src/tools/Makefile.in
@@ -130,7 +130,7 @@ cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(
@@ -130,7 +130,7 @@
-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
gigaslam.o: gigaslam.c
......
......@@ -4,7 +4,7 @@ Last-Update: 2018-11-19
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -3405,6 +3405,7 @@
@@ -3406,6 +3406,7 @@
src/qt-console/tray-monitor/tray-monitor.pro \
src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
......@@ -12,7 +12,7 @@ Last-Update: 2018-11-19
src/dird/Makefile \
src/dird/bacula-dir.conf \
src/lib/Makefile \
@@ -3510,6 +3511,8 @@
@@ -3511,6 +3512,8 @@
cd src/qt-console
chmod 755 install_conf_file build-depkgs-qt-console
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment