view src/gnuplot-3-iconv.patch @ 3937:2d8b0a2025e4

add of-quaternion-1-cross-fixes.patch missed in c/s 8935178bae18 * src/of-quaternion-1-cross-fixes.patch: new file
author John Donoghue <john.donoghue@ieee.org>
date Sun, 10 May 2015 08:02:22 -0400
parents ceeb3ec75690
children
line wrap: on
line source

diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile
--- gnuplot-4.6.4.orig/config/mingw/Makefile	2014-07-24 20:30:33 -0400
+++ gnuplot-4.6.4/config/mingw/Makefile	2014-07-24 20:30:50 -0400
@@ -382,8 +382,9 @@
 endif
 
 ifdef ICONV
-	CFLAGS += -DHAVE_ICONV
-	TERMLIBS += -liconv
+	CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS)
+        LDFLAGS += $(ICONV_LDFLAGS)
+	TERMLIBS += -liconv 
 endif
 
 ifdef GNU_RC