Do not use backticks inside double quotes in m4 files

Fix portability issues with ancient shells on HP-UX. Closes: #24514

diff --git a/ChangeLog b/ChangeLog
index 774a5c239e9db74c8c96ece6e5506228281d7eb0..62910a485ea1ca6fccaad3e413da0f5374b71e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-18  Guillem Jover  <guillem@debian.org>
+
+       * m4/arch.m4 (_DPKG_ARCHITECTURE): Do not use backticks inside double
+       quotes, to support ancient shells.
+       * m4/libs.m4 (DPKG_LIB_SELINUX): Likewise.
+
 2008-01-18  Guillem Jover  <guillem@debian.org>
 
        * utils/start-stop-daemon.c (do_help): Coalesce mandatory options

diff --git a/debian/changelog b/debian/changelog
index 062c5dc3117e785b91f6a657575071c442b38b65..546172d2cb0f8b997b33e331b862577278ac34f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low
   * Fix start-stop-daemon --help output to state that --name is one of the
     possible required options to use. Closes: #354999
   * Demote dselect from priority important to optional. Closes: #461327
+  * Fix portability issues on HP-UX, by not using backticks inside double
+    quotes in m4 files. Closes: #24514
 
   [ Frank Lichtenheld ]
   * Make the -L option of dpkg-parsechangelog actually work (it's

diff --git a/m4/arch.m4 b/m4/arch.m4
index e6f242a0bb0d2d336758ad8ceca903124ca03735..2f3ae5f73a9d52d6db6228c4cc8c7e0a7572e961 100644 (file)
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -4,8 +4,8 @@
 # the target architecture, to avoid duplicating its logic.
 AC_DEFUN([_DPKG_ARCHITECTURE], [
 AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-$2="`cd $srcdir/scripts; \
-     PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
+$2=`cd $srcdir/scripts; \
+    PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE

diff --git a/m4/libs.m4 b/m4/libs.m4
index 3a1531b358d0aee5dfc994c7c02efe934d1129dc..1bb1cea6c13285656803a6163606ee0a23d957a3 100644 (file)
--- a/m4/libs.m4
+++ b/m4/libs.m4
@@ -71,9 +71,9 @@ if test "x$with_selinux" != "xno"; then
                [AC_DEFINE(WITH_SELINUX, 1,
                        [Define to 1 to compile in SELinux support])
                 if test "x$with_selinux" = "xstatic"; then
-                       dpkg_selinux_libs="-Wl,-Bstatic `pkg-config --static --libs libselinux` -Wl,-Bdynamic"
+                       dpkg_selinux_libs="-Wl,-Bstatic "`pkg-config --static --libs libselinux`" -Wl,-Bdynamic"
                 else
-                       dpkg_selinux_libs="`pkg-config --libs libselinux`"
+                       dpkg_selinux_libs=`pkg-config --libs libselinux`
                 fi
                 SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs"
                 with_selinux="yes"],