Commit 9bbfbb1c authored by Petri Latvala's avatar Petri Latvala Committed by Arkadiusz Hiler

Make GLib mandatory

GLib was originally made optional for Android builds, and Android
support was dropped a while ago due to lack of use and maintenance.

Building without GLib was broken without bug reports anyway.
Signed-off-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 23d50a49
...@@ -177,10 +177,7 @@ PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXran ...@@ -177,10 +177,7 @@ PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXran
# for testdisplay # for testdisplay
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0]) PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0])
PKG_CHECK_MODULES(LIBUDEV, [libudev]) PKG_CHECK_MODULES(LIBUDEV, [libudev])
PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib=yes], [glib=no]) PKG_CHECK_MODULES(GLIB, [glib-2.0])
if test x"$glib" = xyes; then
AC_DEFINE(HAVE_GLIB,1,[Enable glib support])
fi
PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no]) PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no])
AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes]) AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes])
...@@ -206,9 +203,6 @@ if test "x$enable_chamelium" = xyes; then ...@@ -206,9 +203,6 @@ if test "x$enable_chamelium" = xyes; then
fi fi
PKG_CHECK_MODULES(PIXMAN, pixman-1, [], PKG_CHECK_MODULES(PIXMAN, pixman-1, [],
[AC_MSG_ERROR([Failed to find pixman, required by chamelium.])]) [AC_MSG_ERROR([Failed to find pixman, required by chamelium.])])
if test x"$glib" != xyes; then
AC_MSG_ERROR([Failed to find glib, required by chamelium.])
fi
if test x"$gsl" != xyes; then if test x"$gsl" != xyes; then
AC_MSG_ERROR([Failed to find gsl, required by chamelium.]) AC_MSG_ERROR([Failed to find gsl, required by chamelium.])
fi fi
......
...@@ -55,9 +55,7 @@ ...@@ -55,9 +55,7 @@
#include <limits.h> #include <limits.h>
#include <locale.h> #include <locale.h>
#include <uwildmat/uwildmat.h> #include <uwildmat/uwildmat.h>
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
#include "drmtest.h" #include "drmtest.h"
#include "intel_chipset.h" #include "intel_chipset.h"
...@@ -299,9 +297,7 @@ static struct { ...@@ -299,9 +297,7 @@ static struct {
} log_buffer; } log_buffer;
static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t log_buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
#ifdef HAVE_GLIB
GKeyFile *igt_key_file; GKeyFile *igt_key_file;
#endif
char *igt_frame_dump_path; char *igt_frame_dump_path;
...@@ -573,7 +569,6 @@ static void oom_adjust_for_doom(void) ...@@ -573,7 +569,6 @@ static void oom_adjust_for_doom(void)
} }
#ifdef HAVE_GLIB
static void common_init_config(void) static void common_init_config(void)
{ {
char *key_file_env = NULL; char *key_file_env = NULL;
...@@ -624,7 +619,6 @@ out: ...@@ -624,7 +619,6 @@ out:
if (!key_file_env && key_file_loc) if (!key_file_env && key_file_loc)
free(key_file_loc); free(key_file_loc);
} }
#endif
static void common_init_env(void) static void common_init_env(void)
{ {
...@@ -778,9 +772,7 @@ static int common_init(int *argc, char **argv, ...@@ -778,9 +772,7 @@ static int common_init(int *argc, char **argv,
} }
} }
#ifdef HAVE_GLIB
common_init_config(); common_init_config();
#endif
out: out:
free(short_opts); free(short_opts);
...@@ -1435,10 +1427,8 @@ void igt_exit(void) ...@@ -1435,10 +1427,8 @@ void igt_exit(void)
{ {
igt_exit_called = true; igt_exit_called = true;
#ifdef HAVE_GLIB
if (igt_key_file) if (igt_key_file)
g_key_file_free(igt_key_file); g_key_file_free(igt_key_file);
#endif
if (run_single_subtest && !run_single_subtest_found) { if (run_single_subtest && !run_single_subtest_found) {
igt_warn("Unknown subtest: %s\n", run_single_subtest); igt_warn("Unknown subtest: %s\n", run_single_subtest);
......
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
#ifndef IGT_RC_H #ifndef IGT_RC_H
#define IGT_RC_H #define IGT_RC_H
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
extern GKeyFile *igt_key_file; extern GKeyFile *igt_key_file;
#endif /* HAVE_GLIB */
#endif /* IGT_RC_H */ #endif /* IGT_RC_H */
...@@ -50,10 +50,7 @@ endif ...@@ -50,10 +50,7 @@ endif
cairo = dependency('cairo', version : '>1.12.0', required : true) cairo = dependency('cairo', version : '>1.12.0', required : true)
libudev = dependency('libudev', required : true) libudev = dependency('libudev', required : true)
glib = dependency('glib-2.0', required : false) glib = dependency('glib-2.0', required : true)
if glib.found()
config.set('HAVE_GLIB', 1)
endif
gsl = dependency('gsl', required : false) gsl = dependency('gsl', required : false)
alsa = dependency('alsa', required : false) alsa = dependency('alsa', required : false)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment