diff --git a/m4/pdfium.m4 b/m4/pdfium.m4 index 8294107b..3314b314 100644 --- a/m4/pdfium.m4 +++ b/m4/pdfium.m4 @@ -15,22 +15,6 @@ AC_REQUIRE([AC_PATH_XTRA]) ZLIB_INCLUDES="" ZLIB_LIBS="" -# PDFium has a set of object archives that must be linked firectly into your -# app, and a couple of true libraries. The objects must be linked in this -# order. -pdfium_objects="\ - libpdfium.a \ - libchrome_zlib.a \ - libgmock_main.a \ - libicui18n.a \ - libicuuc.a \ - libjpeg.a \ - libminizip.a \ - libzlib_x86_simd.a \ - libsimd.a \ - libsimd_asm.a \ - libyasm_utils.a" - AC_ARG_WITH(pdfium, AS_HELP_STRING([--without-pdfium], [build without pdfium (default: test)])) # Treat --without-pdfium like --without-pdfium-includes @@ -69,23 +53,16 @@ if test "$PDFIUM_INCLUDES" = ""; then fi # Now for the libraries ... if there's nothing set, try $PREFIX/lib -# we must link with g++ for pdfium if test "$PDFIUM_LIBS" = ""; then pdfium_save_LIBS="$LIBS" pdfium_save_CPPFLAGS="$CPPFLAGS" - LIBS="" - for i in $pdfium_objects; do - LIBS="$LIBS $prefix/lib/pdfium-obj/$i" - done - LIBS="$LIBS -L$prefix/lib -lm -lpthread" - CPPFLAGS="$PDFIUM_INCLUDES $CPPFLAGS -std=c++11" + LIBS="-L$prefix/lib -lpdfium -lc++ -licuuc $LIBS" + CPPFLAGS="$PDFIUM_INCLUDES $CPPFLAGS" - AC_LANG(C++) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], - [FPDF_DOCUMENT doc; doc = FPDF_LoadDocument("", "")])], - [PDFIUM_LIBS="${prefix}/lib"], + AC_TRY_LINK([#include ], + [FPDF_DOCUMENT doc; doc = FPDF_LoadDocument("", "")], + [PDFIUM_LIBS="-L${prefix}/lib -lpdfium -lc++ -licuuc"], [PDFIUM_LIBS=no]) LIBS="$pdfium_save_LIBS"