Permalink
Browse files

Remove more remnants of GLib support

  • Loading branch information...
khaledhosny committed Nov 11, 2017
1 parent 39d1c30 commit cd50fbafae142616519ffe2ff257e98611f2b7ff
Showing with 8 additions and 28 deletions.
  1. +2 −3 bin/Makefile.am
  2. +1 −2 charset/Makefile.am
  3. +0 −14 configure.ac
  4. +2 −2 fribidi-vs-unicode/Makefile.am
  5. +0 −1 fribidi.pc.in
  6. +1 −4 gen.tab/Makefile.am
  7. +2 −2 lib/Makefile.am
View
@@ -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
View
@@ -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 =
View
@@ -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
@@ -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
View
@@ -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@
View
@@ -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 \
View
@@ -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

0 comments on commit cd50fba

Please sign in to comment.