[Xfce4-commits] <ristretto:master> Fix linking problems, thanks to Christopher Wickert for reporting

[Jérôme Guelfucci]

On 07/10/11 08:06, Stephan Arts wrote:
> Updating branch refs/heads/master
>           to fbfd3c509419cf5f8f10639e01c063473ccc93d4 (commit)
>         from c13fe955de02a7df76cd7fa645151204e4ce743f (commit)
>
> commit fbfd3c509419cf5f8f10639e01c063473ccc93d4
> Author: Stephan Arts<stephan at xfce.org>
> Date:   Fri Oct 7 08:05:20 2011 +0200
>
>      Fix linking problems, thanks to Christopher Wickert for reporting
>
>   src/Makefile.am |    5 ++++-
>   1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 19a9852..efb416c 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -33,6 +33,9 @@ ristretto_CFLAGS = \
>   	-DDATADIR=\"$(datadir)\" \
>   	-DSRCDIR=\"$(top_srcdir)\" \
>   	-DLOCALEDIR=\"$(localedir)\"
> +
> +ristretto_LDFLAGS = \
> +    -lm -lX11
>
>   ristretto_LDADD = \
>   	$(GTK_LIBS) \
> @@ -43,7 +46,7 @@ ristretto_LDADD = \
>   	$(CAIRO_LIBS) \
>   	$(XFCONF_LIBS) \
>   	$(LIBXFCE4UTIL_LIBS) \
> -	$(LIBXFCE4UI_LIBS) -lX11
> +	$(LIBXFCE4UI_LIBS)
>
>   INCLUDES = \
>   	-I${top_srcdir}

Hey Stephan,

For linking against libm, I guess it would be cleaner to use:

AC_CHECK_LIBM
AC_SUBST(LIBM)

then add $LIBM to LDADD.

For libx11, we have our own macro in xfce-dev-tools:

XDT_CHECK_LIBX11()

then add $LIBX11_{CFLAGS,LIBS}

Cheers,

Jérôme