kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Fix image library detection
rodzic
1b38e53542
commit
985ce14bb5
25
m4/images.m4
25
m4/images.m4
|
@ -26,6 +26,17 @@ AC_DEFUN([AC_FLDIGI_JPEG], [
|
|||
AC_ARG_VAR([LIBJPEG_CFLAGS], [C compiler flags for JPEG])
|
||||
AC_ARG_VAR([LIBJPEG_LIBS], [linker flags for JPEG])
|
||||
|
||||
AC_ARG_WITH([jpeg],
|
||||
AC_HELP_STRING([--with-jpeg], [enable libjpeg support @<:@autodetect@:>@]),
|
||||
[case "${withval}" in
|
||||
yes|no) ac_cv_want_libjpeg="${withval}" ;;
|
||||
*) AC_MSG_ERROR([bad value "${withval}" for --with-jpeg]) ;;
|
||||
esac],
|
||||
[ac_cv_want_libjpeg=check])
|
||||
|
||||
if test "x$ac_cv_want_libjpeg" = "xno"; then
|
||||
ac_cv_libjpeg=no
|
||||
else
|
||||
AC_FLDIGI_JPEG_HDR([$LIBJPEG_CFLAGS])
|
||||
if test "x$ac_cv_header_jpeglib_h" != "xyes"; then
|
||||
ac_cv_libjpeg=no
|
||||
|
@ -42,6 +53,8 @@ AC_DEFUN([AC_FLDIGI_JPEG], [
|
|||
fi
|
||||
AC_MSG_RESULT([$ac_cv_libjpeg])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_libjpeg" = "xyes"; then
|
||||
AC_DEFINE([USE_LIBJPEG], 1, [Define to 1 if we are using libjpeg])
|
||||
else
|
||||
|
@ -77,6 +90,17 @@ AC_DEFUN([AC_FLDIGI_PNG], [
|
|||
AC_ARG_VAR([LIBPNG_CFLAGS], [C compiler flags for PNG])
|
||||
AC_ARG_VAR([LIBPNG_LIBS], [linker flags for PNG])
|
||||
|
||||
AC_ARG_WITH([png],
|
||||
AC_HELP_STRING([--with-png], [enable libpng support @<:@autodetect@:>@]),
|
||||
[case "${withval}" in
|
||||
yes|no) ac_cv_want_libpng="${withval}" ;;
|
||||
*) AC_MSG_ERROR([bad value "${withval}" for --with-png]) ;;
|
||||
esac],
|
||||
[ac_cv_want_libpng=check])
|
||||
|
||||
if test "x$ac_cv_want_libpng" = "xno"; then
|
||||
ac_cv_libpng=no
|
||||
else
|
||||
if test "x$LIBPNG_CFLAGS" != "x" || test "x$LIBPNG_LIBS" != "x"; then
|
||||
AC_FLDIGI_PKG_CHECK([libpng], [libpng >= 1.2.8], [no], [yes])
|
||||
else
|
||||
|
@ -92,6 +116,7 @@ AC_DEFUN([AC_FLDIGI_PNG], [
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_libpng" = "xyes"; then
|
||||
AC_DEFINE([USE_LIBPNG], 1, [Define to 1 if we are using libpng])
|
||||
|
|
Ładowanie…
Reference in New Issue