diff options
author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2017-11-05 23:33:37 +0100 |
---|---|---|
committer | Brian C. Lane <bcl@redhat.com> | 2017-12-19 09:50:55 -0800 |
commit | 571293e3f9ee45f37867578899c6a8a9cd35afd4 (patch) | |
tree | 8d9a725e9a44d14bfa7286f288894ffc200224d1 | |
parent | 465fdd8d72e7f8517d67ec7b5f227f5482928ec1 (diff) | |
download | parted-571293e3f9ee45f37867578899c6a8a9cd35afd4.tar.gz |
libparted/labels: link with libiconv if needed
gpt.c uses iconv so it should link with it. Otherwise, on platforms
where libiconv is a separate library, we get a link failure of parted:
CCLD parted
../libparted/.libs/libparted.so: undefined reference to `libiconv'
../libparted/.libs/libparted.so: undefined reference to `libiconv_open'
../libparted/.libs/libparted.so: undefined reference to `libiconv_close'
Since iconv functionality is needed unconditionally (not only when
gettext is enabled), AM_ICONV needs to be added to configure.ac.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | libparted/labels/Makefile.am | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d158793..738c697 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,8 @@ fi AC_PROG_LIBTOOL LT_INIT +AM_ICONV + AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) if test "$USE_INCLUDED_LIBINTL" = "yes"; then diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am index 3327c8c..db612d1 100644 --- a/libparted/labels/Makefile.am +++ b/libparted/labels/Makefile.am @@ -36,7 +36,7 @@ liblabels_la_SOURCES = \ rdb.c \ sun.c -liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) +liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV) AM_CPPFLAGS = $(partedincludedir) $(INTLINCS) |