Fix libiconv linker flags

git-svn-id: http://svn.osgeo.org/postgis/trunk@7392 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 603fb4286c7b0876f4438229e81ffb2b97e6ec0c..643710d17a549ebeb01ea07a4f96640e1e7de80d 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -41,9 +41,6 @@ ICONV_CFLAGS=@ICONV_CFLAGS@
 # liblwgeom
 LIBLWGEOM=../liblwgeom/liblwgeom.a
 
-LIBICONV=@LIBICONV@
-LTLIBICONV=@LTLIBICONV@
-
 # GTK includes and libraries
 GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
 GTK_LIBS = @GTK_LIBS@ @IGE_MAC_LIBS@

diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index 5bc7df4b7b3492a2985d5a445c68ed4971b8ea2d..58f26981863ddc544e03c1d665b26beb6a717cdc 100644 (file)
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -28,14 +28,16 @@ PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
 # liblwgeom
 LIBLWGEOM=../../liblwgeom/liblwgeom.a
 
+# iconv flags
+ICONV_LDFLAGS=@ICONV_LDFLAGS@
+ICONV_CFLAGS=@ICONV_CFLAGS@
+
 # GetText includes and libraries
-LIBICONV=@LIBICONV@
-LTLIBICONV=@LTLIBICONV@
 GETTEXT_CFLAGS = @GETTEXT_CFLAGS@
 GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@
 
 # Build full linking line
-LDFLAGS = -lm $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(LTLIBICONV) $(CUNIT_LDFLAGS)
+LDFLAGS = -lm $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(ICONV_LDFLAGS) $(CUNIT_LDFLAGS)
 
 OBJS=  \
        cu_list.o \