[icedtea6][RFC] Fix: xalan/xerces dependencies issues in F15 build

[Danesh Dadachanji]

Hi,

On 13/06/11 11:53 AM, Deepak Bhole wrote:
>> >    	ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar&&  \
>> >    	ln -sf $(XALAN2_SERIALIZER_JAR) \
>> >    	$(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar&&  \
>> >  -	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
>> >  +	ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar&&  \
>> >  +	if test -n "$(XML_COMMONS_APIS_JAR)"; \
>> >  +    then \
>> >  +    ln -sf $(XML_COMMONS_APIS_JAR) \
>> >  +      $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar; \
>> >  +  fi
>
> The indentation above seems incorrect (the fi is more indented than the
> if). Please double check.
>
Changed the spaces to tabs.

>> >  +AC_DEFUN([IT_FIND_XML_COMMONS_APIS_JAR],
>> >  +[
>> >  +  AC_MSG_CHECKING([for a xml-commons-apis jar])
> <rant>
> "for an xml-commons-apis jar"
> </rant>
>
Fixed this as well. The {xalan,xerces} messages are similar though so 
they'll have to be changed eventually.

>> >  +    if test -f "${withval}" ; then
>> >  +      XML_COMMONS_APIS_JAR="${withval}"
>> >  +    fi
> Why -f? A link should be acceptable too.
>
I was following what others were doing but I've added a check for a 
symlink. Perhaps the other checks (e.g. xerces, rhino) will need this as 
well?

>> >  +  if test -z "${XML_COMMONS_APIS_JAR}"; then
>> >  +    if test -e "/usr/share/java/xml-commons-apis.jar"; then
>> >  +      XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-apis.jar
>> >  +    elif test -e "/usr/share/xml-commons/lib/xml-apis.jar"; then
>> >  +      XML_COMMONS_APIS_JAR=/usr/share/xml-commons/lib/xml-apis.jar
>> >  +    else
>> >  +      AC_MSG_RESULT(no)
>> >  +    fi
>> >  +  fi
> These search locations should account for Debian, Gentoo, SuSE and
> Ubuntu at the very least.
>
Added specific paths for Debian, SuSE and Ubuntu. I'd done Gentoo 
already =)

>> >  +  if test -z "${XML_COMMONS_APIS_JAR}"; then
>> >  +    AC_MSG_ERROR("A xml-commons-apis jar was not found.")
>> >  +  fi
> <rant2>
> "An xml-commons-apis jar..."
> </rant2>  :)
>
Same as above.

Here's the new patch. I've also added myself to the AUTHORS list =)

Regards,
Danesh
> Rest looks okay to me.
>
> Cheers,
> Deepak
>
>> >    fi
>> >    AC_CONFIG_FILES([javac], [chmod +x javac])
>> >    AC_CONFIG_FILES([javap], [chmod +x javap])
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makefile-xalan-deps.patch
Type: text/x-patch
Size: 5942 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110613/8aebc139/Makefile-xalan-deps.patch