Makefile.am | 3 --- configure.ac | 5 ++--- harfbuzz.pc.in | 11 ----------- src/Makefile.am | 42 ++++++++++++++++++++++++++++-------------- src/harfbuzz-icu.pc.in | 13 +++++++++++++ src/harfbuzz.pc.in | 11 +++++++++++ src/hb-unicode.cc | 2 +- test/api/Makefile.am | 1 + test/api/test-c.c | 4 ++++ 9 files changed, 60 insertions(+), 32 deletions(-)
New commits: commit 22ce0961742df0a213f2cc86ca3d5a72453c00b1 Author: Behdad Esfahbod <[email protected]> Date: Tue May 28 17:18:30 2013 -0400 Generate harfbuzz-icu.pc Currently it only works with ICU that has .pc files. I'll wait till someone complains before fixing it for icu-config systems. diff --git a/Makefile.am b/Makefile.am index 19c2095..3f67639 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,9 +6,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src util test -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = harfbuzz.pc - EXTRA_DIST = \ autogen.sh \ harfbuzz.doap \ diff --git a/configure.ac b/configure.ac index 3f1add9..2bf484d 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,10 @@ AC_INIT([HarfBuzz], [http://harfbuzz.org/]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([harfbuzz.pc.in]) +AC_CONFIG_SRCDIR([src/harfbuzz.pc.in]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define color-tests]) +AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability]) AM_SILENT_RULES([yes]) # Initialize libtool @@ -370,7 +370,6 @@ dnl =========================================================================== AC_CONFIG_FILES([ Makefile -harfbuzz.pc src/Makefile src/hb-version.h src/hb-icu-le/Makefile diff --git a/harfbuzz.pc.in b/harfbuzz.pc.in deleted file mode 100644 index e92319e..0000000 --- a/harfbuzz.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: harfbuzz -Description: Text shaping library -Version: @VERSION@ - -Libs: -L${libdir} -lharfbuzz -Cflags: -I${includedir}/harfbuzz diff --git a/src/Makefile.am b/src/Makefile.am index f7e7e9d..9334587 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -217,6 +217,8 @@ libharfbuzz_la_LIBADD = $(HBLIBS) EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) pkginclude_HEADERS = $(HBHEADERS) nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = harfbuzz.pc if HAVE_ICU lib_LTLIBRARIES += libharfbuzz-icu.la @@ -225,8 +227,19 @@ libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS) libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la pkginclude_HEADERS += hb-icu.h +pkgconfig_DATA += harfbuzz-icu.pc endif +%.pc: %.pc.in $(top_builddir)/config.status + $(AM_V_GEN) \ + cat "$<" | \ + $(SED) -e 's@%prefix%@$(prefix)@g;' | \ + $(SED) -e 's@%exec_prefix%@$(exec_prefix)@g;' | \ + $(SED) -e 's@%libdir%@$(libdir)@g;' | \ + $(SED) -e 's@%includedir%@$(includedir)@g;' | \ + $(SED) -e 's@%VERSION%@$(VERSION)@g;' | \ + cat > "[email protected]" && mv "[email protected]" "$@" || ( $(RM) "[email protected]"; false ) + CLEANFILES += harfbuzz.def harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in new file mode 100644 index 0000000..949869a --- /dev/null +++ b/src/harfbuzz-icu.pc.in @@ -0,0 +1,13 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library ICU integration +Version: %VERSION% + +Requires: harfbuzz +Requires.private: icu-uc +Libs: -L${libdir} -lharfbuzz-icu +Cflags: -I${includedir}/harfbuzz diff --git a/src/harfbuzz.pc.in b/src/harfbuzz.pc.in new file mode 100644 index 0000000..7f27bbb --- /dev/null +++ b/src/harfbuzz.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library +Version: %VERSION% + +Libs: -L${libdir} -lharfbuzz +Cflags: -I${includedir}/harfbuzz commit d9afa111330771461b6182ada9f4edd68bcfce77 Author: Behdad Esfahbod <[email protected]> Date: Tue May 28 15:27:40 2013 -0400 Build hb-icu into libharfbuzz-icu.so diff --git a/src/Makefile.am b/src/Makefile.am index 342a3fb..f7e7e9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,13 +137,6 @@ hb-gobject-enums.cc: hb-gobject-enums.cc.tmpl $(HBHEADERS) mv "[email protected]" "$@" || ( $(RM) "@.tmp" && false ) endif -if HAVE_ICU -HBCFLAGS += $(ICU_CFLAGS) -HBLIBS += $(ICU_LIBS) -HBSOURCES += hb-icu.cc -HBHEADERS += hb-icu.h -endif - if HAVE_FREETYPE HBCFLAGS += $(FREETYPE_CFLAGS) HBLIBS += $(FREETYPE_LIBS) @@ -204,7 +197,7 @@ export_symbols = -export-symbols harfbuzz.def harfbuzz_def_dependency = harfbuzz.def libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) else -if HAVE_ICU +if HAVE_ICU_LE libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) else # Use a C linker for GCC, not C++; Don't link to libstdc++ @@ -225,6 +218,16 @@ EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) pkginclude_HEADERS = $(HBHEADERS) nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) +if HAVE_ICU +lib_LTLIBRARIES += libharfbuzz-icu.la +libharfbuzz_icu_la_SOURCES = hb-icu.cc +libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS) +libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la +pkginclude_HEADERS += hb-icu.h +endif + + CLEANFILES += harfbuzz.def harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) $(AM_V_GEN) (echo EXPORTS; \ @@ -313,14 +316,12 @@ dist_check_SCRIPTS = \ check-symbols.sh \ $(NULL) -if HAVE_ICU -else -dist_check_SCRIPTS += check-libstdc++.sh -endif - if HAVE_ICU_LE else -dist_check_SCRIPTS += check-static-inits.sh +dist_check_SCRIPTS += \ + check-libstdc++.sh \ + check-static-inits.sh \ + $(NULL) endif TESTS = $(dist_check_SCRIPTS) diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc index 0a3907e..b7e0987 100644 --- a/src/hb-unicode.cc +++ b/src/hb-unicode.cc @@ -133,7 +133,7 @@ hb_unicode_funcs_get_default (void) #ifdef HAVE_GLIB HB_UNICODE_FUNCS_IMPLEMENT(glib) -#elif defined(HAVE_ICU) +#elif 0 && defined(HAVE_ICU) HB_UNICODE_FUNCS_IMPLEMENT(icu) #elif defined(HAVE_UCDN) HB_UNICODE_FUNCS_IMPLEMENT(ucdn) diff --git a/test/api/Makefile.am b/test/api/Makefile.am index 99548a2..bef7716 100644 --- a/test/api/Makefile.am +++ b/test/api/Makefile.am @@ -33,6 +33,7 @@ test_unicode_CPPFLAGS += $(GLIB_CFLAGS) endif if HAVE_ICU test_unicode_CPPFLAGS += $(ICU_CFLAGS) +test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-icu.la endif commit 7d395c2a255a44fd0d65365ea9b525dba70c062c Author: Behdad Esfahbod <[email protected]> Date: Tue May 28 15:25:06 2013 -0400 Minor diff --git a/test/api/test-c.c b/test/api/test-c.c index 25a38e5..6e8602f 100644 --- a/test/api/test-c.c +++ b/test/api/test-c.c @@ -51,6 +51,10 @@ #include <hb-uniscribe.h> #endif +#ifdef HAVE_CORETEXT +#include <hb-coretext.h> +#endif + int main (int argc, char **argv) { _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
