You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.0 KiB
47 lines
1.0 KiB
4 years ago
|
--- 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
|
||
|
4 years ago
|
--- a/parted/Makefile.am
|
||
|
|
+++ b/parted/Makefile.am
|
||
|
|
@@ -41,7 +41,8 @@ parted_LDADD = \
|
||
|
|
libver.a \
|
||
|
|
$(top_builddir)/libparted/libparted.la \
|
||
|
|
$(INTLLIBS) $(LIBS) \
|
||
|
|
- $(PARTED_LIBS)
|
||
|
|
+ $(PARTED_LIBS) \
|
||
|
|
+ $(LIBICONV)
|
||
|
|
|
||
|
|
parted_LDFLAGS = $(PARTEDLDFLAGS)
|
||
|
|
|
||
|
|
--- a/partprobe/Makefile.am
|
||
|
|
+++ b/partprobe/Makefile.am
|
||
|
|
@@ -9,7 +9,8 @@ partprobe_SOURCES = partprobe.c
|
||
|
|
partprobe_LDADD = \
|
||
|
|
$(top_builddir)/libparted/libparted.la \
|
||
|
|
$(INTLLIBS) $(LIBS) \
|
||
|
|
- $(PARTED_LIBS)
|
||
|
|
+ $(PARTED_LIBS) \
|
||
|
|
+ $(LIBICONV)
|
||
|
|
|
||
|
|
partprobe_LDFLAGS = $(PARTEDLDFLAGS)
|
||
|
|
|
||
|
4 years ago
|
--- a/libparted/labels/Makefile.am
|
||
|
|
+++ b/libparted/labels/Makefile.am
|
||
|
|
@@ -35,7 +35,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)
|
||
|
|
|