diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2014-05-10 05:07:37 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2014-05-10 05:07:37 +0400 |
| commit | 079c2e126f594c5a338a779c72a899951de38960 (patch) | |
| tree | 5d4816e07df12d64a19a12fa2bb5378601f418d4 /eglib | |
| parent | 88cf2f1f929a8cdcb2ad5497c7242f8f76231828 (diff) | |
[eglib] Remove test-glib code, we don't have to maintain compatibility with glib any more. Fixes #19638.
Diffstat (limited to 'eglib')
| -rw-r--r-- | eglib/configure.ac | 13 | ||||
| -rw-r--r-- | eglib/test/Makefile.am | 18 |
2 files changed, 0 insertions, 31 deletions
diff --git a/eglib/configure.ac b/eglib/configure.ac index f8853385a8d..fab57247699 100644 --- a/eglib/configure.ac +++ b/eglib/configure.ac @@ -235,19 +235,6 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan fi ) -dnl -dnl No, you can not replace the call below with a pkg.m4 macro -dnl -have_glib=false -if test "x$PKG_CONFIG" != "xno"; then - if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then - have_glib=true; - else - have_glib=false; - fi -fi -AM_CONDITIONAL(HAVE_GLIB, $have_glib) - AC_SUBST(GPOINTER_TO_INT) AC_SUBST(GPOINTER_TO_UINT) AC_SUBST(GINT_TO_POINTER) diff --git a/eglib/test/Makefile.am b/eglib/test/Makefile.am index 3f914fd510d..c669d844ec5 100644 --- a/eglib/test/Makefile.am +++ b/eglib/test/Makefile.am @@ -37,26 +37,8 @@ test_eglib_LDADD = ../src/libeglib.la $(LIBICONV) run-eglib: all srcdir=`readlink -f $(srcdir)` ./test-eglib -if HAVE_GLIB - -noinst_PROGRAMS = test-glib test-eglib - -test_glib_SOURCES = $(SOURCES) - -test_glib_CFLAGS = `pkg-config --cflags glib-2.0` -DDRIVER_NAME=\"GLib\" -test_glib_LDFLAGS = `pkg-config --libs glib-2.0 gmodule-2.0` - -run-glib: all - srcdir=`readlink -f $(srcdir)` ./test-glib - -run-both: run-glib run-eglib - -else - noinst_PROGRAMS = test-eglib run-both: run-eglib -endif - MAINTAINERCLEANFILES = Makefile.in |