Skip to content

Commit

Permalink
move imageio use message to darwin case, else AC_MSG_RESULT prints no…
Browse files Browse the repository at this point in the history
…thing.
  • Loading branch information
sezero committed Oct 14, 2018
1 parent 94b12f7 commit 9fa1b8f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
9 changes: 4 additions & 5 deletions configure
Expand Up @@ -12191,6 +12191,10 @@ else
enable_imageio=yes
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImageIO support" >&5
$as_echo_n "checking for ImageIO support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_imageio" >&5
$as_echo "$enable_imageio" >&6; }
if test x$enable_imageio = xyes; then
IMG_LIBS="-Wl,-framework,ApplicationServices -lobjc $IMG_LIBS"
else
Expand Down Expand Up @@ -12826,11 +12830,6 @@ else
fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImageIO support" >&5
$as_echo_n "checking for ImageIO support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_imageio" >&5
$as_echo "$enable_imageio" >&6; }

if (test x$enable_jpg = xyes || test x$enable_tif = xyes) && test x$enable_imageio != xyes; then
ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
if test "x$ac_cv_header_jpeglib_h" = xyes; then :
Expand Down
7 changes: 3 additions & 4 deletions configure.in
Expand Up @@ -79,6 +79,9 @@ case "$host" in
*-*-darwin*)
AC_ARG_ENABLE([imageio], [AC_HELP_STRING([--enable-imageio], [use native Mac OS X frameworks for loading images [default=yes]])],
[], [enable_imageio=yes])
dnl Show a message when we use ImageIO support so it's not a surprise
AC_MSG_CHECKING([for ImageIO support])
AC_MSG_RESULT($enable_imageio)
if test x$enable_imageio = xyes; then
IMG_LIBS="-Wl,-framework,ApplicationServices -lobjc $IMG_LIBS"
else
Expand Down Expand Up @@ -161,10 +164,6 @@ AC_ARG_ENABLE([webp], [AC_HELP_STRING([--enable-webp], [support loading WEBP ima
AC_ARG_ENABLE([webp-shared], AC_HELP_STRING([--enable-webp-shared], [dynamically load WEBP support [[default=yes]]]),
[], [enable_webp_shared=yes])

dnl Show a message when we use ImageIO support so it's not a surprise
AC_MSG_CHECKING([for ImageIO support])
AC_MSG_RESULT($enable_imageio)

if (test x$enable_jpg = xyes || test x$enable_tif = xyes) && test x$enable_imageio != xyes; then
AC_CHECK_HEADER([jpeglib.h], [have_jpg_hdr=yes])
AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], [have_jpg_lib=yes])
Expand Down

0 comments on commit 9fa1b8f

Please sign in to comment.