Don't use subdir libcharset if libiconv is used.

diff --git a/utf8/Makefile.am b/utf8/Makefile.am
index 337c52fa6e8462da0afd6436272dea9ddc5f98be..97689ed0f330c4aef5bce0f2de7fb0319f67d6d4 100644 (file)
--- a/utf8/Makefile.am
+++ b/utf8/Makefile.am
@@ -2,13 +2,13 @@
 # $Id$
 # $Name$
 
-SUBDIRS = libcharset .
+SUBDIRS = @LCS_SUBDIRS@ .
 
-INCLUDES = -I $(srcdir)/libcharset
+INCLUDES = @LCS_INCLUDES@
 CFLAGS   = -g -O2 -W -Wall -pedantic -Wno-long-long
 
 noinst_LTLIBRARIES = libutf8.la
 libutf8_la_SOURCES = utf8-locale.c
 libutf8_la_LDFLAGS = $(LIBICONV)
-libutf8_la_LIBADD  = libcharset/libcharset.la
+libutf8_la_LIBADD  = @LCS_LIBADD@
 noinst_HEADERS = utf8-locale.h