[Libreoffice] configure.in for shm_get

[Wols Lists]

Another configure to test ...

For cloph - I've wrapped findhome in a "os ne darwin" so hopefully the
old mac stuff will fire fine :-)

Cheers,
Wol

On 05/12/10 22:36, Norbert Thiebaud wrote:
> the following patch worked for MacOS
>
>
> diff --git a/configure.in b/configure.in
> index d875950..ea6bea1 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -3674,8 +3674,8 @@ fi
>
>  if test "$SOLAR_JAVA" != ""; then
>      dnl first check if we have been asked to autodetect JAVA_HOME
> with a recent gij
> -    if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
> -      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
> +    if test "$JAVA_HOME" = "/usr" -o -z "$JAVA_HOME"; then
> +      if test "x$with_jdk_home" = "x"; then
>          cat > findhome.java <<_ACEOF
>  [import java.io.File;
>
> @@ -3703,6 +3703,9 @@ _ACEOF
>          AC_MSG_CHECKING([if gij knows its java.home])
>          JAVA_HOME=`$JAVAINTERPRETER findhome`
>          if test $? = 0 && test "$JAVA_HOME" != "" ; then
> +          if test "$_os" = "Darwin" ; then
> +             JAVA_HOME="$JAVA_HOME/Home"
> +          fi
>            AC_MSG_RESULT([$JAVA_HOME])
>          else
>            echo "configure: java test failed" >&5
>
>
> On Sun, Dec 5, 2010 at 4:17 PM, Wols Lists <antlists at youngman.org.uk> wrote:
>> On 05/12/10 20:50, Wols Lists wrote:
>>> On 05/12/10 20:40, Caolán McNamara wrote:
>>>> On Sun, 2010-12-05 at 17:24 +0000, Wols Lists wrote:
>>>>> Yup. findhome found the right place (or I assume it did).
>>>>>
>>>>> /opt/icedtea6-bin-1.9.1
>>>> Yeah, so what I'd like to see is that findhome (or something like it) is
>>>> the normal way to get the jdk home when one is not set via the
>>>> --with-jdk-home. And if that fails for some reason then fall back to the
>>>> "get the path to java and cut bits off it and hope for the best" route
>>>> rather than trying that first.
>>>>
>>>> IIRC I tried this before, and there was some cockup under MacOSX, so if
>>>> someone on MacOSX could see what findhome says and if its correct/wrong
>>>> vs what works correctly there, that'd be helpful.
>>>>
>>> HMMM!!!
>>>
>>> It's the MacOS test that's messing up gentoo ...!
>>>
>>> So what someone (me? you?) might do is just put  the findhome test in
>>> regardless, or put it at the start with a wrapper "if OS != mac".
>>>
>>> (
>>> I'd actually rather it tried "whereis" first, but I don't think that's
>>> always there, and my sed-awk-whatsit-fu isn't up to that...
>>> anthony at ashdown ~/gitstuff/lotest $ whereis javac
>>> javac: /usr/bin/javac /opt/icedtea6-bin-1.9.1/bin/javac
>>> anthony at ashdown ~/gitstuff/lotest $
>>> It seems so simple - take the last entry and strip the last two bits off
>>> - bet there's a snag ...
>>> )
>>>
>>> Let's wait til tomorrow night to see if anyone on a mac bites, and if
>>> they don't we can try and do this and get it in the build.
>>>
>>> Cheers,
>>> Wol
>>> _______________________________________________
>>> LibreOffice mailing list
>>> LibreOffice at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>> _______________________________________________
>> LibreOffice mailing list
>> LibreOffice at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: configure.in
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101205/44217c3a/attachment.txt>