From df8b8ec19ae13ff4c6aff740b924acdfaeb99450 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 10 Mar 2011 11:29:50 -0500 Subject: Remove obsolete autoconf macro IT_FIND_RHINO_JAR 2011-03-10 Omair Majid * acinclude.m4 (IT_FIND_RHINO_JAR): Remove. --- ChangeLog | 4 ++++ acinclude.m4 | 56 -------------------------------------------------------- 2 files changed, 4 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45fb4d7..0b936e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-03-10 Omair Majid + + * acinclude.m4 (IT_FIND_RHINO_JAR): Remove. + 2011-03-10 Omair Majid * tests/netx/pac/pac-funcs-test.js diff --git a/acinclude.m4 b/acinclude.m4 index 8ba89f0..3c3803b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -323,62 +323,6 @@ AC_DEFUN([IT_FIND_OPTIONAL_JAR], 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]) -- cgit v1.2.3