commit 6e8ad3150566d16a20cb3b54267191bcb0c14208 Author: Damien Goutte-Gattat Date: Tue Feb 23 22:05:37 2021 +0000 qt: Honor the --disable-rpath option. * m4/qt.m4: Do not set rpath if --disable-rpath has been specified at configure time. -- GnuPG-bug-id: 5307 Signed-off-by: Damien Goutte-Gattat diff --git a/m4/qt.m4 b/m4/qt.m4 index f8ef3f6..5f9de3f 100644 --- a/m4/qt.m4 +++ b/m4/qt.m4 @@ -59,7 +59,9 @@ AC_DEFUN([FIND_QT], qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core` if test -n "$qtlibdir"; then + if test "$enable_rpath" != "no"; then PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\"" + fi fi AC_CHECK_TOOL(MOC, moc) diff -up pinentry-1.1.1/configure.rpath pinentry-1.1.1/configure --- pinentry-1.1.1/configure.rpath 2021-04-16 09:08:48.306479991 +0200 +++ pinentry-1.1.1/configure 2021-04-16 09:09:29.365068549 +0200 @@ -10765,7 +10776,9 @@ fi qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core` if test -n "$qtlibdir"; then + if test "$enable_rpath" != "no"; then PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\"" + fi fi if test -n "$ac_tool_prefix"; then