diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | libjq.map | 86 |
3 files changed, 1 insertions, 113 deletions
diff --git a/Makefile.am b/Makefile.am index 6d4c3740..db912494 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,7 @@ AM_YFLAGS = --warnings=all -d lib_LTLIBRARIES = libjq.la libjq_la_SOURCES = ${LIBJQ_SRC} libjq_la_LIBADD = -lm -if HAVE_LD_VERSION_SCRIPT -libjq_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libjq.map -version-info 1:4:0 -endif +libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0 include_HEADERS = jv.h jq.h diff --git a/configure.ac b/configure.ac index a4def6aa..fad6221a 100644 --- a/configure.ac +++ b/configure.ac @@ -13,30 +13,6 @@ AC_PROG_YACC AC_OBJEXT AC_EXEEXT LT_INIT([shared static win32-dll]) -AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes") - -AC_MSG_CHECKING([if libraries can be versioned]) -GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` -if test "$GLD"; then - have_ld_version_script=yes - AC_MSG_RESULT(yes) -else - have_ld_version_script=no - AC_MSG_RESULT(no) - AC_MSG_WARN(*** You have not enabled versioned symbols.) -fi -AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") - -if test "$have_ld_version_script" = "yes"; then - AC_MSG_CHECKING([for symbol prefix]) - SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ - | ${CPP-${CC-gcc} -E} - 2>&1 \ - | ${EGREP-grep} "^PREFIX=" \ - | ${SED-sed} "s:^PREFIX=::"` - AC_SUBST(SYMBOL_PREFIX) - AC_MSG_RESULT($SYMBOL_PREFIX) -fi - AM_PROG_CC_C_O dnl couldn't use AM_PROG_LEX as it doesn't support header files like the diff --git a/libjq.map b/libjq.map deleted file mode 100644 index bc16b4c3..00000000 --- a/libjq.map +++ /dev/null @@ -1,86 +0,0 @@ -JQ_1.4 { - global: - jq_compile; - jq_compile_args; - jq_dump_disassembly; - jq_init; - jq_next; - jq_set_nomem_handler; - jq_start; - jq_teardown; - jq_testsuite; - jv_array; - jv_array_append; - jv_array_concat; - jv_array_contains; - jv_array_get; - jv_array_length; - jv_array_set; - jv_array_sized; - jv_array_slice; - jv_bool; - jv_cmp; - jv_contains; - jv_copy; - jv_delpaths; - jv_dels; - jv_dump; - jv_dump_string; - jv_equal; - jv_false; - jv_free; - jv_get; - jv_get_kind; - jv_getpath; - jv_get_refcnt; - jv_group; - jv_has; - jv_invalid; - jv_invalid_get_msg; - jv_invalid_has_msg; - jv_invalid_with_msg; - jv_keys; - jv_kind_name; - jv_load_file; - jv_mem_alloc; - jv_mem_free; - jv_mem_uninitialised; - jv_nomem_handler; - jv_null; - jv_number; - jv_number_value; - jv_object; - jv_object_contains; - jv_object_delete; - jv_object_get; - jv_object_iter; - jv_object_iter_key; - jv_object_iter_next; - jv_object_iter_valid; - jv_object_iter_value; - jv_object_length; - jv_object_merge; - jv_object_set; - jv_parse; - jv_parser_free; - jv_parser_init; - jv_parser_next; - jv_parser_set_buf; - jv_parse_sized; - jv_set; - jv_setpath; - jv_sort; - jv_string; - jv_string_append_buf; - jv_string_append_str; - jv_string_concat; - jv_string_fmt; - jv_string_hash; - jv_string_length_bytes; - jv_string_length_codepoints; - jv_string_sized; - jv_string_value; - jv_true; - local: - *; -}; |