[Xfce4-commits] <ristretto:master> Use XDT_CHECK_X11() and AC_CHECK_LIBM macro's

[Stephan Arts]

Updating branch refs/heads/master
         to 3633de6df5865d419b99e7971df975557c8fa22b (commit)
       from b78eb62ca66d696de16543f42e35601ec98c1442 (commit)

commit 3633de6df5865d419b99e7971df975557c8fa22b
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Oct 7 19:28:15 2011 +0200

    Use XDT_CHECK_X11() and AC_CHECK_LIBM macro's
    
    Check for X11 and libm using the right AC macro's

 configure.in.in |    5 +++++
 src/Makefile.am |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 0bbab76..9286718 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -65,6 +65,11 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
 
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.8.0])
 
+XDT_CHECK_LIBX11()
+
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
 dnl **************************
 dnl *** Check for xsltproc ***
 dnl **************************
diff --git a/src/Makefile.am b/src/Makefile.am
index efb416c..3d73f6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,13 +30,11 @@ ristretto_CFLAGS = \
 	$(CAIRO_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
+	$(LIBX11_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
 	-DLOCALEDIR=\"$(localedir)\"
 
-ristretto_LDFLAGS = \
-    -lm -lX11
- 
 ristretto_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
@@ -46,7 +44,9 @@ ristretto_LDADD = \
 	$(CAIRO_LIBS) \
 	$(XFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCE4UI_LIBS)
+	$(LIBXFCE4UI_LIBS) \
+	$(LIBX11_LIBS) \
+	$(LIBM)
 
 INCLUDES = \
 	-I${top_srcdir}