Mercurial > hg > release > icedtea-web-1.1

changeset 164:dfebbb0b44f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove obsolete autoconf macro IT_FIND_RHINO_JAR 2011-03-10 Omair Majid <omajid@redhat.com> * acinclude.m4 (IT_FIND_RHINO_JAR): Remove.
author Omair Majid <omajid@redhat.com>
date Thu, 10 Mar 2011 11:29:50 -0500
parents 79839fc3d5a1
children 5454292b3fae
files ChangeLog acinclude.m4
diffstat 2 files changed, 4 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 10 11:10:37 2011 -0500
+++ b/ChangeLog	Thu Mar 10 11:29:50 2011 -0500
@@ -1,3 +1,7 @@
+2011-03-10  Omair Majid  <omajid@redhat.com>
+
+	* acinclude.m4 (IT_FIND_RHINO_JAR): Remove.
+
 2011-03-10  Omair Majid  <omajid@redhat.com>
 
 	* tests/netx/pac/pac-funcs-test.js
--- a/acinclude.m4	Thu Mar 10 11:10:37 2011 -0500
+++ b/acinclude.m4	Thu Mar 10 11:29:50 2011 -0500
@@ -323,62 +323,6 @@
   AC_SUBST($2_AVAILABLE)
 ])
 
-AC_DEFUN([IT_FIND_RHINO_JAR],
-[
-  AC_MSG_CHECKING([whether to include Javascript support via Rhino])
-  AC_ARG_WITH([rhino],
-              [AS_HELP_STRING(--with-rhino,specify location of the rhino jar)],
-  [
-    case "${withval}" in
-      yes)
-        RHINO_JAR=yes
-        ;;
-      no)
-        RHINO_JAR=no
-        ;;
-      *)
-        if test -f "${withval}"; then
-          RHINO_JAR="${withval}"
-        elif test -z "${withval}"; then
-          RHINO_JAR=yes
-        else
-          AC_MSG_RESULT([not found])
-          AC_MSG_ERROR("The rhino jar ${withval} was not found.")
-        fi
-    ;;
-     esac
-  ],
-  [
-    RHINO_JAR=yes
-  ])
-  if test x"${RHINO_JAR}" = "xyes"; then
-    if test -e "/usr/share/java/rhino.jar"; then
-      RHINO_JAR=/usr/share/java/rhino.jar
-    elif test -e "/usr/share/java/js.jar"; then
-      RHINO_JAR=/usr/share/java/js.jar
-    elif test -e "/usr/share/rhino-1.6/lib/js.jar"; then
-      RHINO_JAR=/usr/share/rhino-1.6/lib/js.jar
-    fi
-    if test x"${RHINO_JAR}" = "xyes"; then
-      AC_MSG_RESULT([not found])
-      AC_MSG_ERROR("A rhino jar was not found in /usr/share/java as either rhino.jar or js.jar.")
-    fi
-  fi
-  AC_MSG_RESULT(${RHINO_JAR})
-  AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
-dnl Clear RHINO_JAR if it doesn't contain a valid filename
-  if test x"${RHINO_JAR}" = "xno"; then
-    RHINO_JAR=
-  fi
-  if test -n ${RHINO_JAR} ; then
-    RHINO_AVAILABLE=true
-  else
-    RHINO_AVAILABLE=false
-  fi
-  AC_SUBST(RHINO_JAR)
-  AC_SUBST(RHINO_AVAILABLE)
-])
-
 AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
 [
 AC_MSG_CHECKING([whether to build the browser plugin])