diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-07-23 18:34:01 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-07-23 18:34:01 +0000 |
| commit | 54d42c46eece26d1b7f49bb2958304315bd42e2b (patch) | |
| tree | 967aa9653ae62bb1ce8bb2b75fa4a7e3d45d011e /configure.ac | |
| parent | Fix canvas scroll events in GTK+ 3 (diff) | |
| download | inkscape-54d42c46eece26d1b7f49bb2958304315bd42e2b.tar.gz inkscape-54d42c46eece26d1b7f49bb2958304315bd42e2b.zip | |
Bitmap. Fix for Bug #165952 (png resolution not imported) by Daniel Wagenaar.
(bzr r11567)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e76b63c19..da277d1bb 100644 --- a/configure.ac +++ b/configure.ac @@ -208,11 +208,29 @@ fi dnl ****************************** dnl Check for libpng dnl ****************************** -AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm) +AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm) if test "x$png_ok" != "xyes"; then AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape]) fi +dnl ****************************** +dnl Check for libexif +dnl ****************************** +AC_CHECK_LIB(exif, exif_data_new_from_file, [AC_CHECK_HEADER(libexif/exif-data.h, exif_ok=yes, exif_ok=no)], exif_ok=no, -lm) +if test "x$exif_ok" = "xyes"; then + LIBS="-lexif $LIBS" + AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) +fi + +dnl ****************************** +dnl Check for libjpeg +dnl ****************************** +AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) +if test "x$jpeg_ok" = "xyes"; then + LIBS="-ljpeg $LIBS" + AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) +fi + dnl Handle possible dlopen requirement for libgc dnl Isn't this internal to something in autoconf? Couldn't find it... AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen], |