File 0001-configure.ac-Add-enable-relocation-force-c... of Package mingw32-dbus-1

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-configure.ac-Add-enable-relocation-force-command-line-.txt of Package mingw32-dbus-1 (Revision 7653631d280ffb801a67d20d262327be)

Currently displaying revision 7653631d280ffb801a67d20d262327be , Show latest

From 1b9ccab0257abfef13d97c7d9444b9e34ac2dec4 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 5 Jun 2019 12:27:55 +0200
Subject: [PATCH] configure.ac: Add --enable-relocation=force command line
 option

see https://gitlab.freedesktop.org/dbus/dbus/issues/220 for details
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 83b3eb72..9affbb49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1494,12 +1494,12 @@ AC_SUBST(DBUS_LIBEXECDIR)
 AC_DEFINE_UNQUOTED(DBUS_LIBEXECDIR,"$DBUS_LIBEXECDIR", [Directory for installing the libexec binaries])
 
 AC_ARG_ENABLE([relocation],
-  [AS_HELP_STRING([--enable-relocation[=yes/no/auto]],
+  [AS_HELP_STRING([--enable-relocation[=yes/no/auto/force]],
     [Make pkg-config metadata relocatable [default=auto]])],
   [], [enable_relocation=auto])
 
 can_relocate=yes
-
+AS_IF([test "x$enable_relocation" != xforce],
 AS_CASE(["${exec_prefix}"],
   ['NONE'|'${prefix}'|"${prefix}"],
     [:],
@@ -1521,6 +1521,7 @@ AS_CASE(["${libdir}"],
       AS_IF([test "x$enable_relocation" = xyes],
         [AC_MSG_ERROR([Relocatable pkg-config metadata requires default libdir, not ${libdir}])])
     ])
+)
 
 # By default, on Windows we are relocatable if possible
 AS_IF([test "x$enable_relocation" = xauto && test "x$dbus_win" = xyes],
@@ -1534,8 +1535,8 @@ AS_IF([test "x$enable_relocation" = xauto],
   [enable_relocation="no"])
 
 
-AS_IF([test "x$enable_relocation" = xyes],
-  [AC_SUBST([pkgconfig_prefix], ['${pcfiledir}/../..'])],
+AS_IF([test "x$enable_relocation" = xyes || test "x$enable_relocation" = xforce],
+  [AC_SUBST([pkgconfig_prefix], ['${pcfiledir}/../../'])],
   [AC_SUBST([pkgconfig_prefix], ['${original_prefix}'])])
 
 #### Directory to source sysconfdir configuration from
-- 
2.13.7

Places

File 0001-configure.ac-Add-enable-relocation-force-command-line-.txt of Package mingw32-dbus-1 (Revision 7653631d280ffb801a67d20d262327be)

Places