Merge branch 'upstream' into tizen

diff --cc bin/Makefile.am
index bea50c6,d3de41b..9427873
--- 1/bin/Makefile.am
--- 2/bin/Makefile.am
+++ b/bin/Makefile.am
@@@ -13,20 -10,10 +10,13 @@@ fribidi_benchmark_SOURCES = fribidi-ben
  
  AM_CPPFLAGS = \
                -I$(top_builddir)/lib \
-               -I$(top_srcdir)/lib \
-               -I$(top_srcdir)/charset \
-               $(MISC_CFLAGS)
+               -I$(top_srcdir)/lib
  
- LDADD = $(top_builddir)/lib/libfribidi.la $(MISC_LIBS)
+ LDADD = $(top_builddir)/lib/libfribidi.la
 +### TIZEN_ONLY(20170811): Apply ASLR to executable files.
 +fribidi_LDFLAGS = -pie
 +fribidi_CFLAGS = -fPIE
  
- 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