Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

filter/texttotext.c: link with libiconv if needed #155

Merged
merged 1 commit into from
Sep 16, 2019
Merged

filter/texttotext.c: link with libiconv if needed #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ texttotext_SOURCES = \
filter/texttotext.c
EXTRA_texttotext_SOURCES = filter/strcasestr.c
texttotext_CFLAGS = $(CUPS_CFLAGS)
texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS)
texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) $(LIBICONV)
texttotext_DEPENDENCIES = $(STRCASESTR)

pdftops_SOURCES = \
Expand Down Expand Up @@ -1049,3 +1049,5 @@ if ENABLE_BRAILLE
$(RM) $(DESTDIR)$(pkgfilterdir)/vectortoubrl
$(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
endif

SUBDIRS =
17 changes: 17 additions & 0 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,22 @@ aclocal --version > /dev/null 2> /dev/null || {
echo "error: aclocal not found"
exit 1
}

automake --version > /dev/null 2> /dev/null || {
echo "error: automake not found"
exit 1
}

autopoint --version > /dev/null 2> /dev/null || {
echo "error: autopoint not found"
exit 1
}

gettext --version > /dev/null 2> /dev/null || {
echo "error: gettext not found"
exit 1
}

for i in $TESTLIBTOOLIZE; do
if which $i > /dev/null 2>&1; then
LIBTOOLIZE=$i
Expand All @@ -39,6 +50,12 @@ fi

rm -rf autom4te*.cache

autopoint --force || {
echo "error: autopoint failed"
exit 1
}
# autopoint is for libiconv discovery; we don't want the po directory
rm -rf po
$LIBTOOLIZE --force --copy || {
echo "error: libtoolize failed"
exit 1
Expand Down
6 changes: 5 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/ac_define_dir.m4])
m4_include([m4/ax_compare_version.m4])
m4_include([m4/basic-directories.m4])
AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2])
AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects])
AM_SILENT_RULES([yes])
AC_LANG([C++])
AC_CONFIG_HEADERS([config.h])
Expand Down Expand Up @@ -54,13 +54,17 @@ AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
AM_PROG_CC_C_O
AM_ICONV
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.20])

AM_GNU_GETTEXT_VERSION([0.18.3])
AM_GNU_GETTEXT([external])

# ========================================
# Specify the fontdir patch if not default
# ========================================
Expand Down