Просмотр исходного кода

Do not use backticks inside double quotes in m4 files

Fix portability issues with ancient shells on HP-UX. Closes: #24514
Guillem Jover лет назад: 18
Родитель
Сommit
05f5eb2927
4 измененных файлов с 12 добавлено и 4 удалено
  1. 6 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 2
      m4/arch.m4
  4. 2 2
      m4/libs.m4

+ 6 - 0
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

+ 2 - 0
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

+ 2 - 2
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

+ 2 - 2
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"],