Fwd: [rfc][icedtea-web] renewed tagsoup

[Jiri Vanek]

On 06/25/2013 03:14 PM, Adam Domurad wrote:
> On 06/25/2013 04:34 AM, Jiri Vanek wrote:
>> On 06/24/2013 10:21 PM, Adam Domurad wrote:
>>>
>>>>>
>>>>> Thank you for handling this!
>>>>>
>>>>> Happy hacking,
>>>>> -Adam
>>>>
>>>
>>> Hm, Andrew Azores pointed out that HEAD doesn't build without tagsoup
>>> installed. It's intended to be
>>> an optional dependency AFAICS so that should be looked at.
>>>
>>> Thanks,
>>> -Adam
>> yap, small overlook.  Thanx for catch
>>
>> diff -r cedfb2895986 acinclude.m4
>> --- a/acinclude.m4    Mon Jun 24 12:29:46 2013 +0200
>> +++ b/acinclude.m4    Tue Jun 25 10:12:17 2013 +0200
>> @@ -425,7 +425,7 @@
>>     fi
>>     AC_MSG_RESULT(${TAGSOUP_JAR})
>>     AC_SUBST(TAGSOUP_JAR)
>> -  AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno])
>> +  AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != x])
>>   ])
>>
>>   dnl Generic macro to check for a Java class
>>
>>
>> ok to push?
>
> OK to push as long as --with-tagsoup=no still works.
>
:DDD

diff -r cedfb2895986 acinclude.m4
--- a/acinclude.m4	Mon Jun 24 12:29:46 2013 +0200
+++ b/acinclude.m4	Tue Jun 25 17:00:54 2013 +0200
@@ -425,7 +425,7 @@
    fi
    AC_MSG_RESULT(${TAGSOUP_JAR})
    AC_SUBST(TAGSOUP_JAR)
-  AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno])
+  AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ])
  ])

  dnl Generic macro to check for a Java class