Blob Blame History Raw
Index: libthai-0.1.20/libdatrie/datrie/Makefile.am
===================================================================
--- libthai-0.1.20.orig/libdatrie/datrie/Makefile.am
+++ libthai-0.1.20/libdatrie/datrie/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def
 
 AM_CPPFLAGS = -I$(top_srcdir)
 
-lib_LTLIBRARIES = libdatrie.la
+noinst_LTLIBRARIES = libdatrie.la
 
 libdatrie_la_SOURCES =	\
 	typedefs.h	\
Index: libthai-0.1.20/libthai.pc.in
===================================================================
--- libthai-0.1.20.orig/libthai.pc.in
+++ libthai-0.1.20/libthai.pc.in
@@ -6,6 +6,5 @@ includedir=@includedir@
 Name: libthai
 Description: Thai support library
 Version: @VERSION@
-Requires.private: datrie-0.2
 Libs: -L${libdir} -lthai
 Cflags: -I${includedir}
Index: libthai-0.1.20/src/Makefile.am
===================================================================
--- libthai-0.1.20.orig/src/Makefile.am
+++ libthai-0.1.20/src/Makefile.am
@@ -18,7 +18,8 @@ libthai_sublibs = \
 	$(top_builddir)/src/thwchar/libthwchar.la \
 	$(top_builddir)/src/thwctype/libthwctype.la \
 	$(top_builddir)/src/thwstr/libthwstr.la \
-	$(top_builddir)/src/thwbrk/libthwbrk.la 
+	$(top_builddir)/src/thwbrk/libthwbrk.la \
+	$(DATRIE_LIBS)
 
 if LD_HAS_VERSION_SCRIPT
 EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map
Index: libthai-0.1.20/src/thbrk/Makefile.am
===================================================================
--- libthai-0.1.20.orig/src/thbrk/Makefile.am
+++ libthai-0.1.20/src/thbrk/Makefile.am
@@ -15,5 +15,4 @@ libthbrk_la_SOURCES =	\
 	brk-maximal.c	\
 	brk-maximal.h
 
-libthbrk_la_LIBADD = $(DATRIE_LIBS)