summaryrefslogtreecommitdiff
path: root/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/app-backup/bacula/files/bacula-fix-configure-bat.patch')
-rw-r--r--packages/app-backup/bacula/files/bacula-fix-configure-bat.patch78
1 files changed, 78 insertions, 0 deletions
diff --git a/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
new file mode 100644
index 0000000..722123b
--- /dev/null
+++ b/packages/app-backup/bacula/files/bacula-fix-configure-bat.patch
@@ -0,0 +1,78 @@
+diff --git a/configure b/configure
+index 99bb43c8e..cefcbca9f 100755
+--- a/configure
++++ b/configure
+@@ -846,7 +846,7 @@ AWK
+ PIDOF
+ GMAKE
+ QMAKE
+-PKGCONFIG
++PKG_CONFIG
+ DVDRWFORMAT
+ DVDRWMEDIAINFO
+ GROWISOFS
+@@ -5600,12 +5600,12 @@ fi
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKGCONFIG+:} false; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- case $PKGCONFIG in
++ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -5615,7 +5615,7 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -5623,14 +5623,14 @@ done
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_PKGCONFIG" && ac_cv_path_PKGCONFIG="pkg-config"
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="pkg-config"
+ ;;
+ esac
+ fi
+-PKGCONFIG=$ac_cv_path_PKGCONFIG
+-if test -n "$PKGCONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
+-$as_echo "$PKGCONFIG" >&6; }
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -21843,19 +21843,7 @@ fi
+
+ BAT_DIR=
+ if test x$support_bat = xyes; then
+- abc=`$PKGCONFIG QtGui`
+- pkg=$?
+- if test $pkg = 0; then
+- BAT_DIR=src/qt-console
+- else
+- abc=`$PKGCONFIG Qt5Gui`
+- pkg=$?
+- if test $pkg = 0; then
+ BAT_DIR="src/qt-console src/qt-console/tray-monitor"
+- else
+- as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5
+- fi
+- fi
+ fi
+
+