[icedtea-web] RFC: add a new autoconf macro IT_FIND_OPTIONAL_JAR

[Dr Andrew John Hughes]

On 10:57 Wed 09 Mar     , Omair Majid wrote:
> On 03/08/2011 10:44 AM, Omair Majid wrote:
> > The attached patch adds a new autoconf macro IT_FIND_OPTIONAL_JAR. This
> > macro can be used to find jars that enable optional features in
> > icedtea-web. I will be removing IT_FIND_RHINO_JAR in a separate patch.
> 
> This patch removes the unused macro IT_FIND_RHINO_JAR from icedtea-web. 
> The macro IT_FIND_OPTIONAL_JAR is a more generic version and does 
> everything IT_FIND_RHINO_JAR can do.
> 
> Okay to commit?
> 
> ChangeLog
> 2011-03-09  Omair Majid  <omajid at redhat.com>
> 
>      * acinclude.m4 (IT_FIND_RHINO_JAR): Remove.
> 
> 
> Cheers,
> Omair

Yeah.  I think you can count that as trivial and commit without even asking ;-)

> diff -r 1d1539d38db0 ChangeLog
> --- a/ChangeLog	Wed Mar 09 09:51:07 2011 -0500
> +++ b/ChangeLog	Wed Mar 09 10:56:40 2011 -0500
> @@ -1,3 +1,7 @@
> +2011-03-09  Omair Majid  <omajid at redhat.com>
> +
> +	* acinclude.m4 (IT_FIND_RHINO_JAR): Remove.
> +
>  2011-03-09  Andrew Su  <asu at redhat.com>
>  
>  	* netx/net/sourceforge/jnlp/controlpanel/SecuritySettingsPanel.java:
> diff -r 1d1539d38db0 acinclude.m4
> --- a/acinclude.m4	Wed Mar 09 09:51:07 2011 -0500
> +++ b/acinclude.m4	Wed Mar 09 10:56:40 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])


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37