projects / packages / jbig2dec.git / blame
| Commit | Line | Data |
|---|---|---|
| d94ee010 JB |
1 | --- jbig2dec-0.9/Makefile.am.orig 2005-05-24 05:49:47.000000000 +0200 |
| 2 | +++ jbig2dec-0.9/Makefile.am 2006-08-27 00:18:23.211079500 +0200 | |
| 3 | @@ -4,10 +4,10 @@ | |
| 4 | # require automake 1.7 | |
| 5 | AUTOMAKE_OPTIONS = foreign 1.7 dist-bzip2 dist-zip -Wall | |
| 6 | ||
| 7 | -lib_LIBRARIES = libjbig2dec.a | |
| 8 | +lib_LTLIBRARIES = libjbig2dec.la | |
| 9 | include_HEADERS = jbig2.h | |
| 10 | ||
| 11 | -libjbig2dec_a_SOURCES = jbig2.c \ | |
| 12 | +libjbig2dec_la_SOURCES = jbig2.c \ | |
| 13 | jbig2_arith.c jbig2_arith_int.c jbig2_arith_iaid.c jbig2_huffman.c \ | |
| 14 | jbig2_segment.c jbig2_page.c \ | |
| 15 | jbig2_symbol_dict.c jbig2_text.c \ | |
| 16 | @@ -26,7 +26,7 @@ | |
| 17 | jbig2dec_SOURCES = jbig2dec.c sha1.c sha1.h \ | |
| 18 | jbig2.h jbig2_image.h getopt.h \ | |
| 19 | os_types.h config_types.h config_win32.h | |
| 20 | -jbig2dec_LDADD = libjbig2dec.a @LIBOBJS@ | |
| 21 | +jbig2dec_LDADD = libjbig2dec.la @LIBOBJS@ $(PNG_LIBS) | |
| 22 | ||
| 23 | EXTRA_DIST = test_jbig2dec.py msvc.mak LICENSE CHANGES | |
| 24 | ||
| 25 | @@ -39,9 +39,9 @@ | |
| 26 | ||
| 27 | test_arith_SOURCES = jbig2_arith.c | |
| 28 | test_arith_CFLAGS = -DTEST | |
| 29 | -test_arith_LDADD = libjbig2dec.a | |
| 30 | +test_arith_LDADD = libjbig2dec.la | |
| 31 | ||
| 32 | test_huffman_SOURCES = jbig2_huffman.c | |
| 33 | test_huffman_CFLAGS = -DTEST | |
| 34 | -test_huffman_LDADD = libjbig2dec.a | |
| 35 | +test_huffman_LDADD = libjbig2dec.la | |
| 36 | ||
| 37 | --- jbig2dec-0.9/configure.ac.orig 2006-07-27 01:57:39.000000000 +0200 | |
| 38 | +++ jbig2dec-0.9/configure.ac 2006-08-27 00:28:46.842054000 +0200 | |
| 39 | @@ -11,7 +11,7 @@ | |
| 40 | ||
| 41 | # Checks for programs. | |
| 42 | AC_PROG_CC | |
| 43 | -AC_PROG_RANLIB | |
| 44 | +AC_PROG_LIBTOOL | |
| 45 | ||
| 46 | # platform specific compiler flags | |
| 47 | if test "x$GCC" = xyes; then | |
| 48 | @@ -34,11 +34,12 @@ | |
| 49 | LDFLAGS="$LDFLAGS -L$ac_cv_want_libpng/lib" | |
| 50 | fi | |
| 51 | dnl libpng requires pow() which may be in libm | |
| 52 | - AC_SEARCH_LIBS([pow], [m]) | |
| 53 | + AC_CHECK_FUNC([pow], [M_LIB=], [AC_CHECK_LIB([m], [pow], [M_LIB="-lm"])]) | |
| 54 | AC_CHECK_LIB([png], [png_check_sig], [ | |
| 55 | AC_CHECK_LIB([z], [deflate], [ | |
| 56 | AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) | |
| 57 | - LIBS="-lpng -lz $LIBS" | |
| 58 | + PNG_LIBS="-lpng -lz $M_LIB" | |
| 59 | + AC_SUBST([PNG_LIBS]) | |
| 60 | AC_LIBOBJ([jbig2_image_png]) | |
| 61 | have_libpng="yes" | |
| 62 | ]) |