Merge branch 'tizen_base' into tizen

Change-Id: I09a19c8b77d2dcda6df857457e15af48da902b09
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --cc Makefile.am
index 7d4b0b9,c6e1a1d..1235371
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -271,22 -268,11 +268,22 @@@ EXTRA_DIST += 
    sljit/sljitUtils.c
  
  if WITH_PCRE8
- libpcre_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE_LDFLAGS)
+ libpcre_la_LDFLAGS = $(EXTRA_LIBPCRE_LDFLAGS)
  endif # WITH_PCRE8
  if WITH_PCRE16
- libpcre16_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE16_LDFLAGS)
+ libpcre16_la_LDFLAGS = $(EXTRA_LIBPCRE16_LDFLAGS)
  endif # WITH_PCRE16
 +if WITH_PCRE32
 +libpcre32_la_LDFLAGS = $(EXTRA_LIBPCRE32_LDFLAGS)
 +endif # WITH_PCRE32
 +
 +if WITH_VALGRIND
 +if WITH_PCRE8
 +libpcre_la_CFLAGS += $(VALGRIND_CFLAGS)
 +endif # WITH_PCRE8
 +if WITH_PCRE16
 +libpcre16_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE16_LDFLAGS)
 +endif # WITH_PCRE16
  
  CLEANFILES += pcre_chartables.c
  

diff --cc packaging/pcre.spec
Simple merge