Don't compile sanei_jpeg if libjpeg is unavailable.

merge-requests/1/head
Mattias Ellert 2009-02-01 15:21:46 +00:00
rodzic 7d909bb234
commit 1d21f36d9f
5 zmienionych plików z 21 dodań i 0 usunięć

Wyświetl plik

@ -1,6 +1,8 @@
2009-02-11 Mattias Ellert <mattias.ellert@fysast.uu.se>
* acinclude.m4, backend/Makefile.am: Restore the removed
DYNAMIC_FLAG configuration.
* acinclude.m4, sanei/sanei_jpeg.c: Don't compile sanei_jpeg
if libjpeg is unavailable.
2009-01-31 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* backend/Makefil.am: Add missing math library to coolscan2

Wyświetl plik

@ -257,6 +257,9 @@ AC_DEFUN([SANE_CHECK_JPEG],
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
],)
],)
if test "$sane_cv_use_libjpeg" = "yes" ; then
AC_DEFINE(HAVE_LIBJPEG,1,[Define to 1 if you have the libjpeg library.])
fi
AC_SUBST(JPEG_LIBS)
])

7
configure vendored
Wyświetl plik

@ -8861,6 +8861,13 @@ fi
fi
if test "$sane_cv_use_libjpeg" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
fi

Wyświetl plik

@ -150,6 +150,9 @@
/* Define to 1 if you have the `ieee1284' library (-lcam). */
#undef HAVE_LIBIEEE1284
/* Define to 1 if you have the libjpeg library. */
#undef HAVE_LIBJPEG
/* Define to 1 if you have the `usb' library (-lusb). */
#undef HAVE_LIBUSB

Wyświetl plik

@ -3,6 +3,10 @@
README.jpeg in the top level directory.
*/
#include "../include/sane/config.h"
#ifdef HAVE_LIBJPEG
#include "sane/sanei_jpeg.h"
typedef struct
@ -227,3 +231,5 @@ sanei_jpeg_jinit_write_ppm (j_decompress_ptr cinfo)
return (djpeg_dest_ptr) dest;
}
#endif