|
|
504bbe7 |
diff -Naur bacula-13.0.0.old/autoconf/bacula-macros/db.m4 bacula-13.0.0/autoconf/bacula-macros/db.m4
|
|
|
504bbe7 |
--- bacula-13.0.0.old/autoconf/bacula-macros/db.m4 2022-07-08 14:50:02.293058459 +0200
|
|
|
504bbe7 |
+++ bacula-13.0.0/autoconf/bacula-macros/db.m4 2022-07-08 14:52:40.525902566 +0200
|
|
|
6fda920 |
@@ -102,7 +102,7 @@
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
DBI_INCLUDE=-I$DBI_INCDIR
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- DBI_LIBS="-R $DBI_LIBDIR -L$DBI_LIBDIR -ldbi"
|
|
|
6fda920 |
+ DBI_LIBS="-L$DBI_LIBDIR -ldbi"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
DBI_LIBS="-L$DBI_LIBDIR -ldbi"
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
@@ -494,7 +494,7 @@
|
|
|
6fda920 |
elif test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
|
|
|
6fda920 |
-o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
|
|
|
6fda920 |
+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
@@ -625,7 +625,7 @@
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
MYSQL_INCLUDE=-I$MYSQL_INCDIR
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
|
|
|
6fda920 |
+ MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
@@ -715,7 +715,7 @@
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
INGRES_INCLUDE=-I$INGRES_INCDIR
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- INGRES_LIBS="-R $INGRES_LIBDIR -L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
|
|
|
6fda920 |
+ INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
INGRES_LIBS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1"
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
@@ -803,7 +803,7 @@
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
SQLITE_INCLUDE=-I$SQLITE_INCDIR
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- SQLITE_LIBS="-R $SQLITE_LIBDIR -L$SQLITE_LIBDIR -lsqlite3"
|
|
|
6fda920 |
+ SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
SQLITE_LIBS="-L$SQLITE_LIBDIR -lsqlite3"
|
|
|
6fda920 |
fi
|
|
|
6fda920 |
@@ -936,7 +936,7 @@
|
|
|
6fda920 |
|
|
|
6fda920 |
POSTGRESQL_INCLUDE=-I$POSTGRESQL_INCDIR
|
|
|
6fda920 |
if test x$use_libtool != xno; then
|
|
|
6fda920 |
- POSTGRESQL_LIBS="-R $POSTGRESQL_LIBDIR -L$POSTGRESQL_LIBDIR -lpq"
|
|
|
6fda920 |
+ POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq"
|
|
|
6fda920 |
else
|
|
|
6fda920 |
POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq"
|
|
|
6fda920 |
fi
|
|
|
504bbe7 |
diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/configure.in
|
|
|
504bbe7 |
--- bacula-13.0.0.old/autoconf/configure.in 2022-07-08 14:50:02.292058441 +0200
|
|
|
504bbe7 |
+++ bacula-13.0.0/autoconf/configure.in 2022-07-08 14:52:40.528902620 +0200
|
|
|
6fda920 |
@@ -16,7 +16,7 @@
|
|
|
6fda920 |
cd ${BUILD_DIR}
|
|
|
6fda920 |
AC_SUBST(BUILD_DIR)
|
|
|
6fda920 |
AC_SUBST(TOP_DIR)
|
|
|
6fda920 |
-AC_CONFIG_AUX_DIR(${BUILD_DIR}/autoconf)
|
|
|
6fda920 |
+AC_CONFIG_AUX_DIR(autoconf)
|
|
|
6fda920 |
AC_CONFIG_HEADERS(src/config.h:autoconf/config.h.in)
|
|
|
6fda920 |
|
|
|
6fda920 |
dnl minimal Win32 stuff for "make clean"
|
|
|
504bbe7 |
@@ -3508,11 +3508,6 @@
|
|
|
6fda920 |
AC_DEFINE(FDLIBS)
|
|
|
6fda920 |
|
|
|
6fda920 |
CFLAGS=${CFLAGS--O}
|
|
|
6fda920 |
-
|
|
|
6fda920 |
-if test x$have_gcc = xyes ; then
|
|
|
6fda920 |
- CPPFLAGS="$CPPFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
|
|
|
6fda920 |
- CFLAGS="$CFLAGS -x c++ -fno-strict-aliasing -fno-exceptions -fno-rtti"
|
|
|
6fda920 |
-fi
|
|
|
6fda920 |
LDFLAGS=${LDFLAGS--O}
|
|
|
6fda920 |
CPPFLAGS="$CPPFLAGS"
|
|
|
6fda920 |
CFLAGS="$CFLAGS"
|
|
|
504bbe7 |
diff -Naur bacula-13.0.0.old/autoconf/Make.common.in bacula-13.0.0/autoconf/Make.common.in
|
|
|
504bbe7 |
--- bacula-13.0.0.old/autoconf/Make.common.in 2022-07-08 14:50:02.290058405 +0200
|
|
|
504bbe7 |
+++ bacula-13.0.0/autoconf/Make.common.in 2022-07-08 14:52:40.529902638 +0200
|
|
|
6fda920 |
@@ -75,12 +75,12 @@
|
|
|
6fda920 |
DEFAULT_ARCHIVE_TYPE = @DEFAULT_ARCHIVE_TYPE@
|
|
|
6fda920 |
DEFAULT_SHARED_OBJECT_TYPE = @DEFAULT_SHARED_OBJECT_TYPE@
|
|
|
6fda920 |
LIBTOOL = @BUILD_DIR@/libtool
|
|
|
6fda920 |
-LIBTOOL_COMPILE = @LIBTOOL@ --silent --tag=CXX --mode=compile
|
|
|
6fda920 |
-LIBTOOL_LINK = @LIBTOOL@ --silent --tag=CXX --mode=link
|
|
|
6fda920 |
-LIBTOOL_INSTALL = @LIBTOOL@ --silent --tag=CXX --mode=install
|
|
|
6fda920 |
-LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --silent --tag=CXX --finish --mode=install
|
|
|
6fda920 |
-LIBTOOL_UNINSTALL = @LIBTOOL@ --silent --tag=CXX --mode=uninstall
|
|
|
6fda920 |
-LIBTOOL_CLEAN = @LIBTOOL@ --silent --tag=CXX --mode=clean
|
|
|
6fda920 |
+LIBTOOL_COMPILE = @LIBTOOL@ --tag=CXX --mode=compile
|
|
|
6fda920 |
+LIBTOOL_LINK = @LIBTOOL@ --tag=CXX --mode=link
|
|
|
6fda920 |
+LIBTOOL_INSTALL = @LIBTOOL@ --tag=CXX --mode=install
|
|
|
6fda920 |
+LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --tag=CXX --finish --mode=install
|
|
|
6fda920 |
+LIBTOOL_UNINSTALL = @LIBTOOL@ --tag=CXX --mode=uninstall
|
|
|
6fda920 |
+LIBTOOL_CLEAN = @LIBTOOL@ --tag=CXX --mode=clean
|
|
|
6fda920 |
|
|
|
6fda920 |
# Flags & libs
|
|
|
6fda920 |
CFLAGS = @CFLAGS@ @OPENSSL_INC@
|
|
|
504bbe7 |
diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-console/bat.pro.in
|
|
|
504bbe7 |
--- bacula-13.0.0.old/src/qt-console/bat.pro.in 2022-07-08 14:50:57.498050723 +0200
|
|
|
504bbe7 |
+++ bacula-13.0.0/src/qt-console/bat.pro.in 2022-07-08 14:52:40.529902638 +0200
|
|
|
6fda920 |
@@ -23,8 +23,8 @@
|
|
|
6fda920 |
DEPENDPATH += .
|
|
|
6fda920 |
INCLUDEPATH += .. . ./console ./restore ./select
|
|
|
6fda920 |
LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
|
|
|
6fda920 |
-LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
|
|
|
6fda920 |
-LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
|
|
|
6fda920 |
+LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link
|
|
|
6fda920 |
+LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install
|
|
|
6fda920 |
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
|
|
|
6fda920 |
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
|
|
|
6fda920 |
QMAKE_CLEAN += .libs/* bat
|
|
|
504bbe7 |
diff -Naur bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in
|
|
|
504bbe7 |
--- bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-08 14:50:02.187056554 +0200
|
|
|
504bbe7 |
+++ bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-08 14:52:40.530902656 +0200
|
|
|
6fda920 |
@@ -36,8 +36,8 @@
|
|
|
6fda920 |
DEPENDPATH += .
|
|
|
6fda920 |
INCLUDEPATH += ../.. .
|
|
|
6fda920 |
QMAKE_CC = $(CXX)
|
|
|
6fda920 |
-LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
|
|
|
6fda920 |
-LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
|
|
|
6fda920 |
+LIBTOOL_LINK = @QMAKE_LIBTOOL@ --tag=CXX --mode=link
|
|
|
6fda920 |
+LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --mode=install
|
|
|
6fda920 |
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
|
|
|
6fda920 |
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
|
|
|
6fda920 |
QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
|