patch-config_office (NOTE for submitting patches)

[Adam Weinberger]

>> (02.14.2004 @ 2142 PST): Nakata Maho said, in 1.9K: <<
> According to /usr/ports/Mk/bsd.port.mk,
> 
> .if ${OSVERSION} < 500016
> PTHREAD_CFLAGS?=        -D_THREAD_SAFE
> PTHREAD_LIBS?=          -pthread
> .elif ${OSVERSION} < 502102
> PTHREAD_CFLAGS?=        -D_THREAD_SAFE
> PTHREAD_LIBS?=          -lc_r
> .else
> PTHREAD_CFLAGS?=
> PTHREAD_LIBS?=          -lpthread
> .endif
> 
> please try following patch:
> 
> @@ -301,6 +306,21 @@
>         "FreeBSD")
>                 test_x=yes
>                 test_gtk=yes
> +               AC_MSG_CHECKING([the FreeBSD operating system release])
> +               if test -n "$with_os_version"; then
> +                       OSVERSION="$with_os_version"
> +               else
> +                       OSVERSION=`/sbin/sysctl -n kern.osreldate`
> +               fi
> +               AC_MSG_RESULT([found OSVERSION=$OSVERSION])
> +               PTHREAD_CFLAGS="-D_THREAD_SAFE"
> +               if test "$OSVERSION" -lt "500016"; then
> +                       PTHREAD_LIBS="-pthread"
> +               elif test "$OSVERSION" -lt "502102"; then
> +                       PTHREAD_LIBS="-lc_r"
> +               else
> +                       PTHREAD_LIBS="-lpthread"
> +               fi
>                 ;;
>         "OSF1")
>                 test_x=dontknow
> 
>> end of "Re: patch-config_office (NOTE for submitting patches)" from Nakata Maho <<

Well, seeing as how $PTHREAD_LIBS and $PTHREAD_CFLAGS are defined in
bsd.port.mk, why not just pass those values in ${CONFIGURE_ENV}? Or put
in a marker in patch-config_office and ${REINPLACE_CMD} it to the proper
values...

# Adam


--
Adam Weinberger
adam at vectors.cx // adamw at FreeBSD.org // adamw at magnesium.net
http://www.vectors.cx