/hg/icedtea7: Avoid giving PAX_COMMAND a value if no PaX utility...

[andrew at icedtea.classpath.org]

changeset ffb3f0d91d72 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ffb3f0d91d72
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Feb 21 22:04:31 2014 +0000

	Avoid giving PAX_COMMAND a value if no PaX utility is available.

	2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* acinclude.m4:
		(IT_WITH_PAX): Leave PAX_COMMAND with the empty
		string rather than "not specified" to avoid build
		failures.
		* pax-mark-vm.in: Update PAX_COMMAND check.


diffstat:

 ChangeLog      |  8 ++++++++
 acinclude.m4   |  7 ++-----
 pax-mark-vm.in |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 25092cbc5ace -r ffb3f0d91d72 ChangeLog
--- a/ChangeLog	Thu Feb 20 15:21:28 2014 +0000
+++ b/ChangeLog	Fri Feb 21 22:04:31 2014 +0000
@@ -1,3 +1,11 @@
+2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* acinclude.m4:
+	(IT_WITH_PAX): Leave PAX_COMMAND with the empty
+	string rather than "not specified" to avoid build
+	failures.
+	* pax-mark-vm.in: Update PAX_COMMAND check.
+
 2014-02-20  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Mention PR1626.
diff -r 25092cbc5ace -r ffb3f0d91d72 acinclude.m4
--- a/acinclude.m4	Thu Feb 20 15:21:28 2014 +0000
+++ b/acinclude.m4	Fri Feb 21 22:04:31 2014 +0000
@@ -2387,10 +2387,7 @@
       fi
     fi
   fi
-  if test -z "${PAX_COMMAND}"; then
-    PAX_COMMAND="not specified"
-    PAX_COMMAND_ARGS="not specified"
-  else
+  if test -n "${PAX_COMMAND}"; then
     AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
     case "${host_cpu}" in
       i?86)
@@ -2402,7 +2399,7 @@
     esac
     AC_MSG_RESULT(${PAX_COMMAND_ARGS})
   fi
-  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "x")
   AC_SUBST(PAX_COMMAND)
   AC_SUBST(PAX_COMMAND_ARGS)
 ])
diff -r 25092cbc5ace -r ffb3f0d91d72 pax-mark-vm.in
--- a/pax-mark-vm.in	Thu Feb 20 15:21:28 2014 +0000
+++ b/pax-mark-vm.in	Fri Feb 21 22:04:31 2014 +0000
@@ -5,7 +5,7 @@
 	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
 }
 
-if test "@PAX_COMMAND@" != "not specified"; then
+if test "x at PAX_COMMAND@" != "x"; then
 	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
 		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
 		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"