From 3a6e357de2816951b0152a802c560e2ad6705e7c Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 14 Feb 2018 20:56:22 +0200 Subject: [PATCH] Drop --disable-charsets --- bin/Makefile.am | 10 +--------- bin/fribidi-main.c | 4 ---- charset/Makefile.am | 8 -------- configure.ac | 10 ---------- doc/Makefile.am | 4 ---- lib/Makefile.am | 4 ---- lib/fribidi.c | 4 ---- lib/fribidi.h | 6 +----- 8 files changed, 2 insertions(+), 48 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 7aab22e..4b4f3cd 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,9 +1,6 @@ bin_PROGRAMS = fribidi -noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types -if FRIBIDI_CHARSETS -noinst_PROGRAMS += fribidi-caprtl2utf8 -endif +noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8 getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h @@ -18,11 +15,6 @@ AM_CPPFLAGS = \ LDADD = $(top_builddir)/lib/libfribidi.la -if FRIBIDI_CHARSETS -else # !FRIBIDI_CHARSETS -LDADD += $(top_builddir)/charset/libfribidi-char-sets.la -endif # !FRIBIDI_CHARSETS - $(top_builddir)/lib/libfribidi.la: cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi.la diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c index 6a39693..cd359a9 100644 --- a/bin/fribidi-main.c +++ b/bin/fribidi-main.c @@ -31,10 +31,6 @@ #include #include -#ifdef FRIBIDI_CHARSETS -#else -# include -#endif /* !FRIBIDI_CHARSETS */ #include #ifdef STDC_HEADERS diff --git a/charset/Makefile.am b/charset/Makefile.am index 3709c1d..62e4efe 100644 --- a/charset/Makefile.am +++ b/charset/Makefile.am @@ -9,17 +9,9 @@ pkginclude_HEADERS = libfribidi_char_sets_la_LDFLAGS = libfribidi_char_sets_la_LIBADD = $(GLIB_LIBS) -if FRIBIDI_CHARSETS - include Headers.mk pkginclude_HEADERS += $(libfribidi_char_sets_la_headers) -else # !FRIBIDI_CHARSETS - -libfribidi_char_sets_la_LDFLAGS += -static - -endif # !FRIBIDI_CHARSETS - libfribidi_char_sets_la_SOURCES = \ fribidi-char-sets.c \ fribidi-char-sets-cap-rtl.c \ diff --git a/configure.ac b/configure.ac index 68b8e15..2d5fda5 100644 --- a/configure.ac +++ b/configure.ac @@ -144,16 +144,6 @@ if test x$enable_deprecated = xno; then [Don not build deprecated functionality]) fi -# --disable-charsets -AC_ARG_ENABLE(charsets, - AC_HELP_STRING([--disable-charsets], - [exclude charset conversion routines from library])) -if test x$enable_charsets != xno; then - AC_DEFINE(FRIBIDI_CHARSETS, 1, - [Include charset conversion routines]) -fi -AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$enable_charsets != xno) - # --with[out]-glib AC_ARG_WITH(glib, AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], diff --git a/doc/Makefile.am b/doc/Makefile.am index 214a8c1..2289ecb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,11 +17,7 @@ include $(top_srcdir)/charset/Headers.mk headers += $(libfribidi_char_sets_la_headers) includepath += -I$(top_srcdir)/charset includevpath += :$(top_srcdir)/charset -if FRIBIDI_CHARSETS inst_symbols += $(libfribidi_char_sets_la_symbols) -else # !FRIBIDI_CHARSETS -noinst_symbols += $(libfribidi_char_sets_la_symbols) -endif # !FRIBIDI_CHARSETS # The lib/Headers.mk stuff should come after all optional stuff. include $(top_srcdir)/lib/Headers.mk diff --git a/lib/Makefile.am b/lib/Makefile.am index 11411d1..eb5f1c2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,8 +14,6 @@ else libfribidi_la_LDFLAGS += -export-symbols-regex "^fribidi_.*" endif # OS_WIN32 -if FRIBIDI_CHARSETS - AM_CPPFLAGS += -I$(top_srcdir)/charset libfribidi_la_LIBADD += $(top_builddir)/charset/libfribidi-char-sets.la libfribidi_la_DEPENDENCIES += $(top_builddir)/charset/libfribidi-char-sets.la @@ -23,8 +21,6 @@ libfribidi_la_DEPENDENCIES += $(top_builddir)/charset/libfribidi-char-sets.la $(top_builddir)/charset/libfribidi-char-sets.la: cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi-char-sets.la -endif # FRIBIDI_CHARSETS - include Headers.mk pkginclude_HEADERS = $(libfribidi_la_headers) nodist_pkginclude_HEADERS = fribidi-config.h diff --git a/lib/fribidi.c b/lib/fribidi.c index d2e91d3..02ebae8 100644 --- a/lib/fribidi.c +++ b/lib/fribidi.c @@ -72,10 +72,6 @@ const char *fribidi_version_info = #ifdef DEBUG " --enable-debug" #endif /* DEBUG */ -#ifdef FRIBIDI_CHARSETS -#else - " --disable-charsets" -#endif /* !FRIBIDI_CHARSETS */ ".\n\n" "Copyright (C) 2004 Sharif FarsiWeb, Inc.\n" "Copyright (C) 2001, 2002, 2004, 2005 Behdad Esfahbod\n" diff --git a/lib/fribidi.h b/lib/fribidi.h index 957d56a..1157eaa 100644 --- a/lib/fribidi.h +++ b/lib/fribidi.h @@ -39,11 +39,7 @@ #include "fribidi-brackets.h" #include "fribidi-arabic.h" #include "fribidi-shape.h" - - -#ifdef FRIBIDI_CHARSETS -# include "fribidi-char-sets.h" -#endif /* FRIBIDI_CHARSETS */ +#include "fribidi-char-sets.h" #ifdef FRIBIDI_NO_DEPRECATED -- 2.40.0