# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1296595237 0
# Node ID 0db0d2392ef2c0d88348b4193c3cbeb04e76b9b8
# Parent  3bd328e4b515373b242ab8690cb5304c3b308e64
Make check for /jre tree produce output during configure.

2010-02-01  Andrew John Hughes  <ahughes@redhat.com>

	* configure.ac: Call IT_CHECK_JRE_PREFIX macro
	rather than doing so inline.
	* acinclude.m4
	(IT_CHECK_JRE_PREFIX): Additions from configure.ac
	supplemented with configure output
	(AC_MSG_CHECKING/AC_MSG_RESULT).

diff -r 3bd328e4b515 -r 0db0d2392ef2 ChangeLog
--- a/ChangeLog	Tue Feb 01 10:53:44 2011 -0500
+++ b/ChangeLog	Tue Feb 01 21:20:37 2011 +0000
@@ -1,3 +1,12 @@
+2010-02-01  Andrew John Hughes  <ahughes@redhat.com>
+
+	* configure.ac: Call IT_CHECK_JRE_PREFIX macro
+	rather than doing so inline.
+	* acinclude.m4
+	(IT_CHECK_JRE_PREFIX): Additions from configure.ac
+	supplemented with configure output
+	(AC_MSG_CHECKING/AC_MSG_RESULT).
+
 2011-01-24 Deepak Bhole <dbhole@redhat.com>
 
 	RH672262, CVE-2011-0025: IcedTea jarfile signature verification bypass
diff -r 3bd328e4b515 -r 0db0d2392ef2 acinclude.m4
--- a/acinclude.m4	Tue Feb 01 10:53:44 2011 -0500
+++ b/acinclude.m4	Tue Feb 01 21:20:37 2011 +0000
@@ -667,3 +667,16 @@
 fi
 AC_PROVIDE([$0])dnl
 ])
+
+AC_DEFUN_ONCE([IT_CHECK_JRE_PREFIX],[
+# Set JRE prefix based on whether top-level prefix is a JDK dir or a JRE dir
+AC_MSG_CHECKING([whether the chosen prefix contains a jre tree])
+if test -d ${prefix}/jre ; then 
+    JRE_DIR_PREFIX="/jre";
+    AC_MSG_RESULT([yes])
+else
+    JRE_DIR_PREFIX="";
+    AC_MSG_RESULT([no])
+fi ;
+AC_SUBST([JRE_DIR_PREFIX])
+])
diff -r 3bd328e4b515 -r 0db0d2392ef2 configure.ac
--- a/configure.ac	Tue Feb 01 10:53:44 2011 -0500
+++ b/configure.ac	Tue Feb 01 21:20:37 2011 +0000
@@ -38,6 +38,7 @@
 IT_GET_PKGVERSION
 IT_OBTAIN_HG_REVISIONS
 IT_CHECK_XULRUNNER_VERSION
+IT_CHECK_JRE_PREFIX
 
 AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
 dnl Check for libX11 headers and libraries.
@@ -78,12 +79,4 @@
 IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
 IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
 
-# Set JRE prefix based on whether to-level prefix is a JDK dir or a JRE dir
-if test -d ${prefix}/jre ; then 
-    JRE_DIR_PREFIX="/jre" ; 
-else
-    JRE_DIR_PREFIX="" ;     
-fi ;
-AC_SUBST([JRE_DIR_PREFIX])
-
 AC_OUTPUT