[gjs/gnome-3-30] build: Remove useless pkgconfig check



commit 7e9e35ee47d5fe73d31623baa3d7f6ae3c3e4491
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Aug 20 22:26:40 2018 -0400

    build: Remove useless pkgconfig check
    
    This was necessary because some test code used to use GUnixOutputStream,
    but it no longer does.

 Makefile-test.am           | 4 ++--
 configure.ac               | 3 ---
 test/gjs-test-coverage.cpp | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index f4c004bb..58901cbd 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -64,13 +64,13 @@ check_PROGRAMS += gjs-tests.gtester minijasmine
 gjs_tests_gtester_CPPFLAGS =                   \
        $(AM_CPPFLAGS)                          \
        -DGJS_COMPILATION                       \
-       $(GJSTESTS_CFLAGS)                      \
+       $(GJS_CFLAGS)                           \
        $(gjs_directory_defines)                \
        -I$(top_srcdir)/test
 
 gjs_tests_gtester_LDADD =      \
        libgjs.la               \
-       $(GJSTESTS_LIBS)
+       $(GJS_LIBS)
 
 gjs_tests_gtester_SOURCES =                            \
        test/gjs-tests.cpp                              \
diff --git a/configure.ac b/configure.ac
index 97331023..a6f303fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,14 +69,11 @@ common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-60"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gtk_packages="gtk+-3.0 >= 3.20"
-# gjs-tests links against everything
-gjstests_packages="gio-unix-2.0 $gjs_packages"
 
 AX_PKG_CHECK_MODULES([GJS], [$GOBJECT_REQUIREMENT], [$gjs_packages])
 dnl These don't need to be put in the .pc file so use regular PKG_CHECK_MODULES
 PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_base_packages])
 PKG_CHECK_MODULES([GJS_CONSOLE], [$gjs_base_packages])
-PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages])
 
 CPPFLAGS_save="$CPPFLAGS"
 CPPFLAGS="$GJS_CFLAGS"
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index 7c1ecb4c..7d3cbcdb 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -35,7 +35,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include <gio/gunixoutputstream.h>
 #include <gjs/gjs.h>
 
 #include "gjs/coverage.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]