From 5b75ff7e55d2d9f03f048e341c3fcff43f5a0a57 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 27 May 2014 15:35:27 +0200 Subject: [PATCH] Try to autodetect the libiconv --- Makefile | 5 +++-- configure | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bb3cb8d8..e86ee9c2 100644 --- a/Makefile +++ b/Makefile @@ -33,10 +33,11 @@ CFLAGS += -g -funsigned-char -O2 CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR} LDFLAGS += -ldl -lpthread -lm +ifeq ($(LIBICONV),yes) +LDFLAGS += -liconv +endif ifneq ($(PLATFORM), darwin) LDFLAGS += -lrt -else -LDFLAGS += -liconv endif ifeq ($(COMPILER), clang) diff --git a/configure b/configure index 0fbe95d0..0072a53d 100755 --- a/configure +++ b/configure @@ -134,6 +134,16 @@ int test(void) return 0; } ' + +check_cc_snippet libiconv ' +#include +int test(void) +{ + iconv_t ic = iconv_open("ASCII", "ASCII"); + return 0; +} +' -liconv + # # Python #