From 42eaa69adc4578f47225ce8e1a7f89fdfaedffa4 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 24 Oct 2009 19:52:01 +0000 Subject: [PATCH] Fix compiling plugins --- configure.ac | 3 ++- src/plugins/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fb33591..0f21b08 100644 --- a/configure.ac +++ b/configure.ac @@ -17,8 +17,9 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16 gtkglext-1.0) PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26) # Define odd RSL install location -AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RLS_LIBS="-lrsl") +AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl") AM_CONDITIONAL(HAVE_RSL, test "$RSL_LIBS" != "") +AC_SUBST(RSL_LIBS) # Output AC_CONFIG_FILES([ diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 52a7840..87b74f1 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -1,6 +1,7 @@ AM_CFLAGS = -Wall --std=gnu99 -I../ AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS) AM_LDFLAGS = -module -avoid-version +LIBS = $(top_srcdir)/src/gis/libgis.la plugindir = $(libdir)/gis @@ -11,7 +12,7 @@ plugin_LTLIBRARIES += radar.la radar_la_SOURCES = radar.c radar.h \ marching.c marching.h \ radar-colormap.c -radar_la_LIBADD = $(RSL_LIBS) +radar_la_LDFLAGS = $(AM_LDFLAGS) $(RSL_LIBS) endif MAINTAINERCLEANFILES = Makefile.in -- 2.43.2