From aa90da2db19e0160bf2aef56385e7a31d61dec2a Mon Sep 17 00:00:00 2001
From: wilson chen <willson.chenwx@gmail.com>
Date: Sat, 28 Mar 2020 22:29:35 +0800
Subject: [PATCH] Fix two build configure errors in tests (#616)

tests/webp/bug_double_free should depend on webp and jpeg.
tests/gdimagesquaretocircle should depend on png.
---
 tests/gdimagesquaretocircle/Makemodule.am | 2 ++
 tests/webp/CMakeLists.txt                 | 6 +++++-
 tests/webp/Makemodule.am                  | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/gdimagesquaretocircle/Makemodule.am b/tests/gdimagesquaretocircle/Makemodule.am
index 5b30300..77b7a30 100644
--- a/tests/gdimagesquaretocircle/Makemodule.am
+++ b/tests/gdimagesquaretocircle/Makemodule.am
@@ -1,5 +1,7 @@
+if HAVE_LIBPNG
 libgd_test_programs += \
 	gdimagesquaretocircle/gdimagesquaretocircle
+endif
 
 EXTRA_DIST += \
 	gdimagesquaretocircle/CMakeLists.txt \
diff --git a/tests/webp/CMakeLists.txt b/tests/webp/CMakeLists.txt
index bfabf26..1d1b98f 100644
--- a/tests/webp/CMakeLists.txt
+++ b/tests/webp/CMakeLists.txt
@@ -1,9 +1,13 @@
 IF(WEBP_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00111
-	bug_double_free
 	gdImageWebpEx
 )
+IF(JPEG_FOUND)
+LIST(APPEND TESTS_FILES
+	bug_double_free
+)
+ENDIF(JPEG_FOUND)
 ENDIF(WEBP_FOUND)
 
 ADD_GD_TESTS()
diff --git a/tests/webp/Makemodule.am b/tests/webp/Makemodule.am
index 48f2a52..528edee 100644
--- a/tests/webp/Makemodule.am
+++ b/tests/webp/Makemodule.am
@@ -1,8 +1,11 @@
 if HAVE_LIBWEBP
 libgd_test_programs += \
 	webp/bug00111 \
-	webp/bug_double_free \
 	webp/gdImageWebpEx
+if HAVE_LIBJPEG
+libgd_test_programs += \
+	webp/bug_double_free
+endif
 endif
 
 EXTRA_DIST += \