aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-10-04 08:32:15 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-10-04 08:32:15 +0000
commit6124fdfc54336d0f96424e2f33f521218778d8b9 (patch)
treed6f85564d73dbb2751beb4a33b6a9a3ee14b5328
parentb9623752e7393971d4e3bacd933aac4cf6b5b17c (diff)
downloadswis-6124fdfc54336d0f96424e2f33f521218778d8b9.tar.gz
swis-6124fdfc54336d0f96424e2f33f521218778d8b9.tar.bz2
* src/Makefile.am (LDADD): Add LIBICONV
* configure.ac: Minor change * gnulib.modules: Add iconv git-svn-id: file:///svnroot/swis/trunk@12 05ba3e8d-823b-0410-8fb2-de0ee4edb5ba
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--gnulib.modules1
-rw-r--r--src/Makefile.am2
4 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7832f3e..5059bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-04 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * src/Makefile.am (LDADD): Add LIBICONV
+ * configure.ac: Minor change
+ * gnulib.modules: Add iconv
+
2007-10-03 Sergey Poznyakoff <gray@gnu.org.ua>
* src/word-split.c: New file.
diff --git a/configure.ac b/configure.ac
index 1ee2e0d..e0f2748 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,10 +23,10 @@ AM_INIT_AUTOMAKE
# Checks for programs.
AC_PROG_CC
-gl_EARLY
AC_PROG_LEX
AC_PROG_YACC
AC_PROG_RANLIB
+gl_EARLY
# Checks for libraries.
diff --git a/gnulib.modules b/gnulib.modules
index e2a68b9..c8f9eaf 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -13,6 +13,7 @@ error
progname
getline
strerror
+iconv
mbchar
mbfile
mbiter
diff --git a/src/Makefile.am b/src/Makefile.am
index 1086aa7..71f7ab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,6 @@ html_strip_SOURCES=html-strip.l
word_split_SOURCES=word-split.c
INCLUDES=-I${top_srcdir}/gnu -I../gnu
-LIBS=../gnu/libgnu.a
+LDADD=../gnu/libgnu.a $(LIBICONV)
EXTRA_DIST=swis.h
AM_LFLAGS=-d

Return to:

Send suggestions and report system problems to the System administrator.