diff options
| -rw-r--r-- | gs/jbig2dec/Makefile.am | 4 | ||||
| -rw-r--r-- | gs/jbig2dec/configure.ac | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gs/jbig2dec/Makefile.am b/gs/jbig2dec/Makefile.am index bfc4b9390..2e094311e 100644 --- a/gs/jbig2dec/Makefile.am +++ b/gs/jbig2dec/Makefile.am @@ -8,7 +8,7 @@ include_HEADERS = jbig2.h CFLAGS = @CFLAGS@ $(XCFLAGS) -libjbig2dec_la_LDFLAGS = -version-info @JBIG2DEC_LT_CURRENT@:@JBIG2DEC_LT_REVISION@:@JBIG2DEC_LT_AGE@ +libjbig2dec_la_LDFLAGS = -version-info @JBIG2DEC_LT_CURRENT@:@JBIG2DEC_LT_REVISION@:@JBIG2DEC_LT_AGE@ -no-undefined libjbig2dec_la_SOURCES = jbig2.c \ jbig2_arith.c jbig2_arith_int.c jbig2_arith_iaid.c jbig2_huffman.c \ jbig2_segment.c jbig2_page.c \ @@ -29,7 +29,7 @@ noinst_PROGRAMS = test_sha1 test_huffman test_arith jbig2dec_SOURCES = jbig2dec.c sha1.c sha1.h \ jbig2.h jbig2_image.h getopt.h \ os_types.h config_types.h config_win32.h -jbig2dec_LDADD = libjbig2dec.la @LIBOBJS@ +jbig2dec_LDADD = libjbig2dec.la @LIBOBJS@ $(PNG_LIBS) dist_man_MANS = jbig2dec.1 diff --git a/gs/jbig2dec/configure.ac b/gs/jbig2dec/configure.ac index c00881a79..26302953c 100644 --- a/gs/jbig2dec/configure.ac +++ b/gs/jbig2dec/configure.ac @@ -48,7 +48,7 @@ if test "x$ac_cv_want_libpng" != "xno"; then AC_CHECK_LIB([png], [png_create_write_struct], [ AC_CHECK_LIB([z], [deflate], [ AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) - LIBS="-lpng -lz $LIBS" + PNG_LIBS="-lpng -lz" AC_LIBOBJ([jbig2_image_png]) have_libpng="yes" ]) @@ -59,6 +59,7 @@ if test "x$have_libpng" != "xyes"; then CFLAGS="$save_cflags" LDFLAGS="$save_ldflags" fi +AC_SUBST(PNG_LIBS) # Checks for header files. AC_HEADER_STDC |