From bbef36583c3aba14b8397cf5238d32c943334bae Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Tue, 11 Jan 2022 23:29:56 +0300
Subject: [PATCH] regenerated autotools
---
Makefile.in | 6 +
configure | 498 ++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 409 insertions(+), 95 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 08bf4e3..b65e437 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,10 +210,14 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERFACE_AGE = @INTERFACE_AGE@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
LIBOBJS = @LIBOBJS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
LIBTOOL = @LIBTOOL@
LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@
LIBWEBP_LIBS = @LIBWEBP_LIBS@
@@ -246,6 +250,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PC_LIBS = @PC_LIBS@
+PC_REQUIRES = @PC_REQUIRES@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
diff --git a/configure b/configure
index d700298..468043c 100755
--- a/configure
+++ b/configure
@@ -775,6 +775,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+PC_REQUIRES
+PC_LIBS
IMG_LIBS
SDL_CONFIG
SDL_LIBS
@@ -782,8 +784,12 @@ SDL_CFLAGS
SDL_VERSION
LIBWEBP_LIBS
LIBWEBP_CFLAGS
+LIBTIFF_LIBS
+LIBTIFF_CFLAGS
LIBPNG_LIBS
LIBPNG_CFLAGS
+LIBJPEG_LIBS
+LIBJPEG_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
@@ -962,8 +968,12 @@ OBJCFLAGS
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+LIBJPEG_CFLAGS
+LIBJPEG_LIBS
LIBPNG_CFLAGS
LIBPNG_LIBS
+LIBTIFF_CFLAGS
+LIBTIFF_LIBS
LIBWEBP_CFLAGS
LIBWEBP_LIBS
SDL_CFLAGS
@@ -1641,9 +1651,17 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ LIBJPEG_CFLAGS
+ C compiler flags for LIBJPEG, overriding pkg-config
+ LIBJPEG_LIBS
+ linker flags for LIBJPEG, overriding pkg-config
LIBPNG_CFLAGS
C compiler flags for LIBPNG, overriding pkg-config
LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
+ LIBTIFF_CFLAGS
+ C compiler flags for LIBTIFF, overriding pkg-config
+ LIBTIFF_LIBS
+ linker flags for LIBTIFF, overriding pkg-config
LIBWEBP_CFLAGS
C compiler flags for LIBWEBP, overriding pkg-config
LIBWEBP_LIBS
@@ -3985,13 +4003,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:3988: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4006: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:3991: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4009: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:3994: output\"" >&5)
+ (eval echo "\"\$as_me:4012: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5202,7 +5220,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5205 "configure"' > conftest.$ac_ext
+ echo '#line 5223 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7032,11 +7050,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7035: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7053: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7039: \$? = $ac_status" >&5
+ echo "$as_me:7057: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7371,11 +7389,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7374: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7392: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7378: \$? = $ac_status" >&5
+ echo "$as_me:7396: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7476,11 +7494,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7479: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7483: \$? = $ac_status" >&5
+ echo "$as_me:7501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7531,11 +7549,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7534: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7552: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7538: \$? = $ac_status" >&5
+ echo "$as_me:7556: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9901,7 +9919,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 9904 "configure"
+#line 9922 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9997,7 +10015,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10000 "configure"
+#line 10018 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12272,81 +12290,6 @@ fi
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 :
- have_jpg_hdr=yes
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
-$as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jpeg_CreateDecompress ();
-int
-main ()
-{
-return jpeg_CreateDecompress ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
-else
- ac_cv_lib_jpeg_jpeg_CreateDecompress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
- have_jpg_lib=yes
-fi
-
- if test x$have_jpg_hdr = xyes -a x$have_jpg_lib = xyes; then
- if test x$enable_jpg = xyes; then
- $as_echo "#define LOAD_JPG 1" >>confdefs.h
-
- fi
-
- case "$host" in
- *-*-darwin*)
- jpg_lib=`find_lib libjpeg.dylib`
- ;;
- *-*-cygwin* | *-*-mingw*)
- jpg_lib=`find_lib "libjpeg*.dll"`
- ;;
- *)
- jpg_lib=`find_lib "libjpeg[0-9]*.so.*"`
- if test x$jpg_lib = x; then
- jpg_lib=`find_lib "libjpeg.so.*"`
- fi
- ;;
- esac
- elif test x$enable_jpg = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find JPEG library (http://www.ijg.org/)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find JPEG library (http://www.ijg.org/)" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPG image loading disabled" >&5
-$as_echo "$as_me: WARNING: JPG image loading disabled" >&2;}
- fi
-fi
-
-if test x$enable_png = xyes -a x$enable_imageio != xyes; then
@@ -12468,6 +12411,213 @@ $as_echo "no" >&6; }
fi
fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
+
+if test -n "$LIBJPEG_CFLAGS"; then
+ pkg_cv_LIBJPEG_CFLAGS="$LIBJPEG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBJPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBJPEG_LIBS"; then
+ pkg_cv_LIBJPEG_LIBS="$LIBJPEG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBJPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBJPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libjpeg" 2>&1`
+ else
+ LIBJPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libjpeg" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBJPEG_PKG_ERRORS" >&5
+
+ 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 :
+
+ have_jpg_hdr=yes
+ LIBJPEG_CFLAGS=""
+
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_CreateDecompress ();
+int
+main ()
+{
+return jpeg_CreateDecompress ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
+else
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
+
+ have_jpg_lib=yes
+ LIBJPEG_LIBS="-ljpeg"
+
+fi
+
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ 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 :
+
+ have_jpg_hdr=yes
+ LIBJPEG_CFLAGS=""
+
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_CreateDecompress ();
+int
+main ()
+{
+return jpeg_CreateDecompress ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
+else
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
+
+ have_jpg_lib=yes
+ LIBJPEG_LIBS="-ljpeg"
+
+fi
+
+
+else
+ LIBJPEG_CFLAGS=$pkg_cv_LIBJPEG_CFLAGS
+ LIBJPEG_LIBS=$pkg_cv_LIBJPEG_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_jpg_hdr=yes
+ have_jpg_lib=yes
+ have_jpg_pc=yes
+
+fi
+ if test x$have_jpg_hdr = xyes -a x$have_jpg_lib = xyes; then
+ if test x$enable_jpg = xyes; then
+ $as_echo "#define LOAD_JPG 1" >>confdefs.h
+
+ fi
+
+ case "$host" in
+ *-*-darwin*)
+ jpg_lib=`find_lib libjpeg.dylib`
+ ;;
+ *-*-cygwin* | *-*-mingw*)
+ jpg_lib=`find_lib "libjpeg*.dll"`
+ ;;
+ *)
+ jpg_lib=`find_lib "libjpeg[0-9]*.so.*"`
+ if test x$jpg_lib = x; then
+ jpg_lib=`find_lib "libjpeg.so.*"`
+ fi
+ ;;
+ esac
+ elif test x$enable_jpg = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find JPEG library (http://www.ijg.org/)" >&5
+$as_echo "$as_me: WARNING: *** Unable to find JPEG library (http://www.ijg.org/)" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JPG image loading disabled" >&5
+$as_echo "$as_me: WARNING: JPG image loading disabled" >&2;}
+ fi
+fi
+
+if test x$enable_png = xyes -a x$enable_imageio != xyes; then
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
$as_echo_n "checking for libpng... " >&6; }
@@ -12642,6 +12792,7 @@ else
$as_echo "yes" >&6; }
have_png_hdr=yes
have_png_lib=yes
+ have_png_pc=yes
fi
if test x$have_png_hdr = xyes -a x$have_png_lib = xyes; then
@@ -12671,13 +12822,131 @@ $as_echo "$as_me: WARNING: PNG image loading disabled" >&2;}
fi
if test x$enable_tif = xyes -a x$enable_imageio != xyes; then
- ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtiff-4" >&5
+$as_echo_n "checking for libtiff-4... " >&6; }
+
+if test -n "$LIBTIFF_CFLAGS"; then
+ pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBTIFF_LIBS"; then
+ pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtiff-4" 2>&1`
+ else
+ LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtiff-4" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBTIFF_PKG_ERRORS" >&5
+
+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+
+ have_tif_hdr=yes
+ LIBTIFF_CFLAGS=""
+
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff -lz $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFClientOpen ();
+int
+main ()
+{
+return TIFFClientOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_tiff_TIFFClientOpen=yes
+else
+ ac_cv_lib_tiff_TIFFClientOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
+
+ have_tif_lib=yes
+ LIBTIFF_LIBS="-ltiff -lz"
+
+fi
+
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
if test "x$ac_cv_header_tiffio_h" = xyes; then :
- have_tif_hdr=yes
+
+ have_tif_hdr=yes
+ LIBTIFF_CFLAGS=""
+
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
$as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12714,9 +12983,23 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
$as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
- have_tif_lib=yes
+
+ have_tif_lib=yes
+ LIBTIFF_LIBS="-ltiff -lz"
+
fi
+
+else
+ LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS
+ LIBTIFF_LIBS=$pkg_cv_LIBTIFF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_tif_hdr=yes
+ have_tif_lib=yes
+ have_tif_pc=yes
+
+fi
if test x$have_tif_hdr = xyes -a x$have_tif_lib = xyes; then
$as_echo "#define LOAD_TIF 1" >>confdefs.h
@@ -12928,6 +13211,7 @@ else
$as_echo "yes" >&6; }
have_webp_hdr=yes
have_webp_lib=yes
+ have_webp_pc=yes
fi
if test x$have_webp_hdr = xyes -a x$have_webp_lib = xyes; then
@@ -13011,10 +13295,16 @@ _ACEOF
else
IMG_LIBS="$LIBWEBP_LIBS $IMG_LIBS"
+ if test x$have_webp_pc = xyes; then
+ PC_REQUIRES="lib$webplib $PC_REQUIRES"
+ else
+ PC_LIBS="$LIBWEBP_LIBS $PC_LIBS"
+ fi
fi
fi
if test x$enable_tif = xyes -a x$have_tif_hdr = xyes -a x$have_tif_lib = xyes; then
+ CFLAGS="$LIBTIFF_CFLAGS $CFLAGS"
if test x$enable_tif_shared = xyes && test x$tif_lib != x; then
echo "-- dynamic libtiff -> $tif_lib"
cat >>confdefs.h <<_ACEOF
@@ -13026,10 +13316,16 @@ _ACEOF
# Disable dynamic jpeg since we're linking it explicitly
jpg_lib=''
fi
- IMG_LIBS="-ltiff -lz $IMG_LIBS"
+ IMG_LIBS="$LIBTIFF_LIBS $IMG_LIBS"
+ if test x$have_tif_pc = xyes; then
+ PC_REQUIRES="libtiff-4 $PC_REQUIRES"
+ else
+ PC_LIBS="$LIBTIFF_LIBS $PC_LIBS"
+ fi
fi
fi
if test x$enable_jpg = xyes -a x$have_jpg_hdr = xyes -a x$have_jpg_lib = xyes; then
+ CFLAGS="$LIBJPEG_CFLAGS $CFLAGS"
if test x$enable_jpg_shared = xyes && test x$jpg_lib != x; then
echo "-- dynamic libjpeg -> $jpg_lib"
cat >>confdefs.h <<_ACEOF
@@ -13037,7 +13333,12 @@ if test x$enable_jpg = xyes -a x$have_jpg_hdr = xyes -a x$have_jpg_lib = xyes; t
_ACEOF
else
- IMG_LIBS="-ljpeg $IMG_LIBS"
+ IMG_LIBS="$LIBJPEG_LIBS $IMG_LIBS"
+ if test x$have_jpg_pc = xyes; then
+ PC_REQUIRES="libjpeg $PC_REQUIRES"
+ else
+ PC_LIBS="$LIBJPEG_LIBS $PC_LIBS"
+ fi
fi
fi
if test x$enable_png = xyes -a x$have_png_hdr = xyes -a x$have_png_lib = xyes; then
@@ -13050,6 +13351,11 @@ _ACEOF
else
IMG_LIBS="$LIBPNG_LIBS $IMG_LIBS"
+ if test x$have_png_pc = xyes; then
+ PC_REQUIRES="libpng $PC_REQUIRES"
+ else
+ PC_LIBS="$LIBPNG_LIBS $PC_LIBS"
+ fi
fi
fi
@@ -13380,6 +13686,8 @@ LIBS="$LIBS $SDL_LIBS"
+
+
OBJCFLAGS=$CFLAGS
# Finally create all the generated files