From cd50fbafae142616519ffe2ff257e98611f2b7ff Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Sun, 12 Nov 2017 00:20:53 +0200
Subject: Remove more remnants of GLib support

---
 bin/Makefile.am                |  5 ++---
 charset/Makefile.am            |  3 +--
 configure.ac                   | 14 --------------
 fribidi-vs-unicode/Makefile.am |  4 ++--
 fribidi.pc.in                  |  1 -
 gen.tab/Makefile.am            |  5 +----
 lib/Makefile.am                |  4 ++--
 7 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index fd495ad..7aab22e 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -14,10 +14,9 @@ fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
 AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
 		-I$(top_srcdir)/lib \
-		-I$(top_srcdir)/charset \
-		$(MISC_CFLAGS)
+		-I$(top_srcdir)/charset
 
-LDADD = $(top_builddir)/lib/libfribidi.la $(MISC_LIBS)
+LDADD = $(top_builddir)/lib/libfribidi.la
 
 if FRIBIDI_CHARSETS
 else # !FRIBIDI_CHARSETS
diff --git a/charset/Makefile.am b/charset/Makefile.am
index 6caf121..3709c1d 100644
--- a/charset/Makefile.am
+++ b/charset/Makefile.am
@@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libfribidi-char-sets.la
 
 AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
-		-I$(top_srcdir)/lib \
-		$(MISC_CFLAGS)
+		-I$(top_srcdir)/lib
 
 pkginclude_HEADERS =
 
diff --git a/configure.ac b/configure.ac
index c98380c..8d324b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,8 +173,6 @@ AC_ARG_WITH(glib,
                              [use Glib @<:@default=auto@:>@]))
 GLIB_PACKAGE=glib-2.0
 GLIB_MINVERSION=2.4
-GLIB_LIBS=
-GLIB_CFLAGS=
 if test x$with_glib = xyes; then
 	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
 	FRIBIDI_USE_GLIB=1
@@ -187,20 +185,8 @@ else
 		FRIBIDI_USE_GLIB=0)
 fi
 fi
-if test x$FRIBIDI_USE_GLIB = x0; then
-	GLIB_PACKAGE=
-fi
-AC_SUBST(FRIBIDI_USE_GLIB)
 AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
 
-
-MISC_CFLAGS="$GLIB_CFLAGS"
-MISC_LIBS="$GLIB_LIBS"
-MISC_PACKAGES="$GLIB_PACKAGE"
-AC_SUBST(MISC_CFLAGS)
-AC_SUBST(MISC_LIBS)
-AC_SUBST(MISC_PACKAGES)
-
 # Generate output
 AC_CONFIG_FILES([fribidi.pc
 		 lib/fribidi-config.h
diff --git a/fribidi-vs-unicode/Makefile.am b/fribidi-vs-unicode/Makefile.am
index 22e4931..e24cc53 100644
--- a/fribidi-vs-unicode/Makefile.am
+++ b/fribidi-vs-unicode/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
 		-I$(top_srcdir)/lib \
 		-I$(top_srcdir)/charset \
-		$(MISC_CFLAGS)
-LDADD = $(top_builddir)/lib/libfribidi.la $(MISC_LIBS)
+		$(GLIB_CFLAGS)
+LDADD = $(top_builddir)/lib/libfribidi.la $(GLIB_LIBS)
 
 if FRIBIDI_USE_GLIB
 check_PROGRAMS = test test-character
diff --git a/fribidi.pc.in b/fribidi.pc.in
index 7988fca..bb3a51c 100644
--- a/fribidi.pc.in
+++ b/fribidi.pc.in
@@ -7,7 +7,6 @@ includedir=@includedir@
 
 Name: @PACKAGE_NAME@
 Description: Unicode Bidirectional Algorithm Library
-Requires: @MISC_PACKAGES@
 Version: @VERSION@
 Libs: -L${libdir} -lfribidi
 Cflags: -I${includedir}/@PACKAGE@
diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index 3d6fb59..7bc3acf 100644
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -21,10 +21,7 @@ DISTCLEANFILES =
 AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
 		-I$(top_srcdir)/lib \
-		-I$(top_srcdir)/charset \
-		$(MISC_CFLAGS)
-
-LDADD = $(MISC_LIBS)
+		-I$(top_srcdir)/charset
 
 VPATH += \
 		$(builddir)/unidata \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fd15292..11411d1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,10 +2,10 @@ EXTRA_DIST = fribidi.def
 
 lib_LTLIBRARIES = libfribidi.la
 
-AM_CPPFLAGS = $(MISC_CFLAGS)
+AM_CPPFLAGS =
 
 libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
-libfribidi_la_LIBADD = $(MISC_LIBS)
+libfribidi_la_LIBADD =
 libfribidi_la_DEPENDENCIES =
 
 if OS_WIN32
-- 
cgit v1.2.1