From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Wed, 12 Feb 2014 04:05:54 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master
X-Git-Tag: json-c-0.12-20140410~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8e0497d4759a1e0a1f3a806fc239e055b845827;p=json-c

Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master

Conflicts:
	Makefile.am
---

c8e0497d4759a1e0a1f3a806fc239e055b845827
diff --cc Makefile.am
index 8f76acb,cc6f005..f06eb31
--- a/Makefile.am
+++ b/Makefile.am
@@@ -30,8 -36,16 +30,8 @@@ libjson_cinclude_HEADERS = 
  #libjsonx_include_HEADERS = \
  #	json_config.h
  
- libjson_c_la_LDFLAGS = -version-info 2:0:0 -no-undefined
+ libjson_c_la_LDFLAGS = -version-info 2:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@
  
 -if ENABLE_OLDNAME_COMPAT
 -libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c @JSON_BSYMBOLIC_LDFLAGS@
 -
 -# Temporary libjson library.  This will be removed after one release.
 -libjson_la_LIBADD = -ljson-c
 -endif
 -
 -
  libjson_c_la_SOURCES = \
  	arraylist.c \
  	debug.c \
diff --cc configure.ac
index b6eae8c,7697be5..878caea
--- a/configure.ac
+++ b/configure.ac
@@@ -49,8 -57,35 +49,34 @@@ AC_LANG_POP([C]
  
  AM_PROG_LIBTOOL
  
+ # Check for the -Bsymbolic-functions linker flag
+ AC_ARG_ENABLE([Bsymbolic],
+               [AS_HELP_STRING([--disable-Bsymbolic], [Avoid linking with -Bsymbolic-function])],
+               [],
+               [enable_Bsymbolic=check])
+ 
+ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
+       [
+         saved_LDFLAGS="${LDFLAGS}"
+         AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+         LDFLAGS=-Wl,-Bsymbolic-functions
+         AC_TRY_LINK([], [int main (void) { return 0; }],
+                     [
+                       AC_MSG_RESULT([yes])
+                       enable_Bsymbolic=yes
+                     ],
+                     [
+                       AC_MSG_RESULT([no])
+                       enable_Bsymbolic=no
+                     ])
+         LDFLAGS="${saved_LDFLAGS}"
+       ])
+ 
+ AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
+ AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
+ 
  AC_CONFIG_FILES([
  Makefile
 -json.pc
  json-c.pc
  tests/Makefile
  json-c-uninstalled.pc