[DebianGIS-dev] [SCM] saga branch, master, updated. 8a7b91d845dd326ad8b7c8779b65c40294d67de2

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 51cbfea7fe170ad2fd3bf4660a944e282f99f23c
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Feb 27 15:04:02 2010 +0100

    Further changes to use grib2 in debian instead of static linked version

diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
index 6fc14fe..e3e91f2 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.am
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
@@ -12,7 +12,7 @@ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
 CXX_INCS           = -I$(top_srcdir)/src/saga_core
 AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
 #AM_LDFLAGS         = -fPIC -shared -lpq -ljasper
-AM_LDFLAGS         = -fPIC -shared -ljasper
+AM_LDFLAGS         = -fPIC -shared -ljasper $(DEP_LIBS)
 pkglib_LTLIBRARIES = libio_grid_grib2.la
 libio_grid_grib2_la_SOURCES =\
 grib2_import.cpp\
diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.in b/src/modules_io/grid/io_grid_grib2/Makefile.in
index f51a2e1..2eb3ee3 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.in
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.in
@@ -225,8 +225,8 @@ DEP_LIBS = -lgrib2c
 DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG
 CXX_INCS = -I$(top_srcdir)/src/saga_core
 AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
-#AM_LDFLAGS         = -fPIC -shared -lpq -ljasper
-AM_LDFLAGS = -fPIC -shared -ljasper
+#AM_LDFLAGS         = -fPIC -shared -lpq -ljasper $(DEP_LIBS)
+AM_LDFLAGS = -fPIC -shared -ljasper $(DEP_LIBS)
 pkglib_LTLIBRARIES = libio_grid_grib2.la
 libio_grid_grib2_la_SOURCES = \
 grib2_import.cpp\

-- 
Saga GIS