summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2004-01-19 09:06:14 +0000
committerSergey Udaltsov <svu@gnome.org>2004-01-19 09:06:14 +0000
commit5961a02626876b7ec6c2561de2d8d13464edf672 (patch)
treeb7495e7b3abb94027a44d192d1a3bdcf1d8ef92e
parentd7b7dfa129a4561b2a46a5b218b645ca2f5bbe69 (diff)
downloadlibxklavier-5961a02626876b7ec6c2561de2d8d13464edf672.tar.gz
trying to be smart about iconv
-rw-r--r--configure.in1
-rw-r--r--libxklavier/Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index bc06a2c..a1582c4 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,7 @@ AC_ISC_POSIX
AC_HEADER_STDC
dnl AC_ARG_PROGRAM
AM_PROG_LIBTOOL
+AM_ICONV
dnl From Bruno Haible.
diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
index c5f82d8..49f65b7 100644
--- a/libxklavier/Makefile.am
+++ b/libxklavier/Makefile.am
@@ -8,6 +8,6 @@ xklavierinc_HEADERS = xklavier.h xklavier_config.h
libxklavier_la_SOURCES = xklavier.c xklavier_xkb.c xklavier_evt.c xklavier_util.c xklavier_config.c xklavier_config_xkb.c xklavier_config_i18n.c xklavier_props.c xklavier_dump.c \
$(noinst_HEADERS) $(xklavierinc_HEADERS)
-libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ $(XML_LIBS) -lxkbfile -L$(x_libraries)
+libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ $(XML_LIBS) -lxkbfile -L$(x_libraries) $(LIBICONV)