GraphicsMagick: configure.ac: Expose pkg-config params we are ge...

changeset 95653e6df876 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=95653e6df876
summary: configure.ac: Expose pkg-config params we are getting for libwebp

diffstat:

 Makefile.in  |    2 -
 configure    |  126 +++++++++-------------------------------------------------
 configure.ac |   30 +++++++++----
 3 files changed, 41 insertions(+), 117 deletions(-)

diffs (251 lines):

diff -r 3bce99ea7040 -r 95653e6df876 Makefile.in
--- a/Makefile.in	Fri Nov 24 17:04:42 2023 -0600
+++ b/Makefile.in	Fri Nov 24 19:49:29 2023 -0600
@@ -2692,8 +2692,6 @@
 UINTPTR_F = @UINTPTR_F@
 UINTPTR_T = @UINTPTR_T@
 VERSION = @VERSION@
-WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
-WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
 WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
 WEBPMUX_LIBS = @WEBPMUX_LIBS@
 WEBP_CFLAGS = @WEBP_CFLAGS@
diff -r 3bce99ea7040 -r 95653e6df876 configure
--- a/configure	Fri Nov 24 17:04:42 2023 -0600
+++ b/configure	Fri Nov 24 19:49:29 2023 -0600
@@ -759,8 +759,6 @@
 HasWEBP_TRUE
 WEBP_LIBS
 WEBP_CFLAGS
-WEBPDEMUX_LIBS
-WEBPDEMUX_CFLAGS
 WEBPMUX_LIBS
 WEBPMUX_CFLAGS
 LIB_TTF
@@ -1163,8 +1161,6 @@
 FREETYPE_LIBS
 WEBPMUX_CFLAGS
 WEBPMUX_LIBS
-WEBPDEMUX_CFLAGS
-WEBPDEMUX_LIBS
 WEBP_CFLAGS
 WEBP_LIBS
 TIFF_CFLAGS
@@ -1930,10 +1926,6 @@
               C compiler flags for WEBPMUX, overriding pkg-config
   WEBPMUX_LIBS
               linker flags for WEBPMUX, overriding pkg-config
-  WEBPDEMUX_CFLAGS
-              C compiler flags for WEBPDEMUX, overriding pkg-config
-  WEBPDEMUX_LIBS
-              linker flags for WEBPDEMUX, overriding pkg-config
   WEBP_CFLAGS C compiler flags for WEBP, overriding pkg-config
   WEBP_LIBS   linker flags for WEBP, overriding pkg-config
   TIFF_CFLAGS C compiler flags for TIFF, overriding pkg-config
@@ -23730,7 +23722,7 @@
 #
 have_trio='no'
 LIB_TRIO=''
-if test "$ac_cv_func_vsnprintf" != 'yes' && test "$with_trio" != 'no'
+if test "$ac_cv_have_decl_vsnprintf" != 'yes' && test "$with_trio" != 'no'
 then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRIO vsnprintf replacement" >&5
 $as_echo_n "checking for TRIO vsnprintf replacement... " >&6; }
@@ -27553,6 +27545,13 @@
     OLD_LIBS=$LIBS
     failed=0
     passed=0
+
+    # libwebpdemux depends on webp
+    # libwebpmux depends on webp
+    # libwebp depends on libsharpyuv
+
+    # Need to add libsharp    libsharpyuv.pc
+
     # libwebp, libwebpmux, libwebpdemux
 
 pkg_failed=no
@@ -27645,107 +27644,22 @@
 $as_echo "yes" >&6; }
 
 fi
-    #printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n"
-    #printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n"
+    printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n"
+    printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n"
     if test $failed -eq 0 ; then
        pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}"
     fi
 
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebpdemux" >&5
-$as_echo_n "checking for libwebpdemux... " >&6; }
-
-if test -n "$WEBPDEMUX_CFLAGS"; then
-    pkg_cv_WEBPDEMUX_CFLAGS="$WEBPDEMUX_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebpdemux\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libwebpdemux") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_WEBPDEMUX_CFLAGS=`$PKG_CONFIG --cflags "libwebpdemux" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$WEBPDEMUX_LIBS"; then
-    pkg_cv_WEBPDEMUX_LIBS="$WEBPDEMUX_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebpdemux\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libwebpdemux") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_WEBPDEMUX_LIBS=`$PKG_CONFIG --libs "libwebpdemux" 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
-	        WEBPDEMUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwebpdemux" 2>&1`
-        else
-	        WEBPDEMUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwebpdemux" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$WEBPDEMUX_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (libwebpdemux) were not met:
-
-$WEBPDEMUX_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables WEBPDEMUX_CFLAGS
-and WEBPDEMUX_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables WEBPDEMUX_CFLAGS
-and WEBPDEMUX_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	WEBPDEMUX_CFLAGS=$pkg_cv_WEBPDEMUX_CFLAGS
-	WEBPDEMUX_LIBS=$pkg_cv_WEBPDEMUX_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
+    # We are not currently using libwebpdemux
+    #PKG_CHECK_MODULES([WEBPDEMUX], [libwebpdemux], [], [])
     #printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n"
     #printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n"
-    if test $failed -eq 0 ; then
-       pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}"
-    fi
+    #if test $failed -eq 0 ; then
+    #   pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}"
+    #fi
+
+    # pkg-config libwebp --static --libs
+    #-L/work/lib -lwebp -lm -lsharpyuv -lm
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
@@ -27817,8 +27731,8 @@
 $as_echo "yes" >&6; }
 	passed=`expr $passed + 1`
 fi
-    #printf "WEBP_LIBS=${WEBP_LIBS}\n"
-    #printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n"
+    printf "WEBP_LIBS=${WEBP_LIBS}\n"
+    printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n"
     if test $failed -eq 0 ; then
        pkg_config_to_flags 'libwebp' "${WEBP_LIBS}" "${WEBP_CFLAGS}"
     fi
diff -r 3bce99ea7040 -r 95653e6df876 configure.ac
--- a/configure.ac	Fri Nov 24 17:04:42 2023 -0600
+++ b/configure.ac	Fri Nov 24 19:49:29 2023 -0600
@@ -1771,7 +1771,7 @@
 #
 have_trio='no'
 LIB_TRIO=''
-if test "$ac_cv_func_vsnprintf" != 'yes' && test "$with_trio" != 'no'
+if test "$ac_cv_have_decl_vsnprintf" != 'yes' && test "$with_trio" != 'no'
 then
    AC_MSG_CHECKING([for TRIO vsnprintf replacement])
    AC_CHECK_LIB([trio],[trio_vsnprintf],[have_trio='yes'],,)
@@ -2658,22 +2658,34 @@
     OLD_LIBS=$LIBS
     failed=0
     passed=0
+
+    # libwebpdemux depends on webp
+    # libwebpmux depends on webp
+    # libwebp depends on libsharpyuv
+
+    # Need to add libsharp    libsharpyuv.pc
+
     # libwebp, libwebpmux, libwebpdemux
     PKG_CHECK_MODULES([WEBPMUX], [libwebpmux], [], [])
-    #printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n"
-    #printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n"
+    printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n"
+    printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n"
     if test $failed -eq 0 ; then
        pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}"
     fi
-    PKG_CHECK_MODULES([WEBPDEMUX], [libwebpdemux], [], [])
+
+    # We are not currently using libwebpdemux
+    #PKG_CHECK_MODULES([WEBPDEMUX], [libwebpdemux], [], [])
     #printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n"
     #printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n"
-    if test $failed -eq 0 ; then
-       pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}"
-    fi
+    #if test $failed -eq 0 ; then
+    #   pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}"
+    #fi
+
+    # pkg-config libwebp --static --libs
+    #-L/work/lib -lwebp -lm -lsharpyuv -lm
     PKG_CHECK_MODULES([WEBP], [libwebp], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`])
-    #printf "WEBP_LIBS=${WEBP_LIBS}\n"
-    #printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n"
+    printf "WEBP_LIBS=${WEBP_LIBS}\n"
+    printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n"
     if test $failed -eq 0 ; then
        pkg_config_to_flags 'libwebp' "${WEBP_LIBS}" "${WEBP_CFLAGS}"
     fi