]> Pileus Git - grits/commitdiff
Fix compiling plugins
authorAndy Spencer <andy753421@gmail.com>
Sat, 24 Oct 2009 19:52:01 +0000 (19:52 +0000)
committerAndy Spencer <andy753421@gmail.com>
Sat, 24 Oct 2009 19:52:01 +0000 (19:52 +0000)
configure.ac
src/plugins/Makefile.am

index fb3359158e2fda856cda1fd55e09ddc0a34b6c1a..0f21b0834d35911804695f73b1b80b1e99a28b59 100644 (file)
@@ -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([
index 52a7840ad918f537b199425d803daed7f7f684a9..87b74f1251ce286451562e2265033b340679793b 100644 (file)
@@ -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