ncurses 5.9 - patch 20141220

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 79273c0808e1a873d0bf29e8476970cc2912c080..11554a3317dcff78b59eba602154ee8c32660a55 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.720 2014/12/13 23:51:50 tom Exp $
+dnl $Id: aclocal.m4,v 1.725 2014/12/21 00:18:37 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3182,7 +3182,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 75 updated: 2014/09/20 20:16:32
+dnl CF_LIB_RULES version: 76 updated: 2014/12/20 19:16:08
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -3234,6 +3234,20 @@ do
 
                SHARED_LIB=
                Libs_To_Make=
+
+               if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
+               then
+                       cat >>$cf_dir/Makefile <<CF_EOF
+
+# Generated by CF_LIB_RULES
+resulting.map: $UNALTERED_SYMS
+       sed -e "s/NCURSES_/NCURSES${cf_cv_abi_version}_/g" < $UNALTERED_SYMS >\[$]@
+
+clean::
+       rm -f resulting.map
+CF_EOF
+               fi
+
                for cf_item in $cf_LIST_MODELS
                do
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
@@ -6840,7 +6854,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_EXPORT_SYMS version: 2 updated: 2014/11/15 19:05:29
+dnl CF_WITH_EXPORT_SYMS version: 3 updated: 2014/12/20 19:16:08
 dnl -------------------
 dnl Use this with libtool to specify the list of symbols that may be exported.
 dnl The input file contains one symbol per line; comments work with "#".
@@ -6861,7 +6875,7 @@ fi
 AC_MSG_RESULT($with_export_syms)
 if test "x$with_export_syms" != xno
 then
-       EXPORT_SYMS="$EXPORT_SYMS -export-symbols $with_export_syms"
+       EXPORT_SYMS="-export-symbols $with_export_syms"
        AC_SUBST(EXPORT_SYMS)
 fi
 ])dnl
@@ -7355,13 +7369,13 @@ CF_NO_LEAKS_OPTION(valgrind,
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 2 updated: 2014/11/15 19:05:29
+dnl CF_WITH_VERSIONED_SYMS version: 3 updated: 2014/12/20 19:16:08
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
 dnl the same as the SONAME at which the symbol was first introduced.
 dnl
-dnl $1 = basename of the ".sym" file (default $PACKAGE)
+dnl $1 = basename of the ".map" file (default $PACKAGE)
 AC_DEFUN([CF_WITH_VERSIONED_SYMS],
 [
 AC_MSG_CHECKING(if versioned-symbols file should be used)
@@ -7376,17 +7390,20 @@ then
 fi
 AC_MSG_RESULT($with_versioned_syms)
 
+RESULTING_SYMS=
+VERSIONED_SYMS=
+
 if test "x$with_versioned_syms" != xno
 then
-       AC_SUBST(VERSIONED_SYMS)
+       RESULTING_SYMS=$with_versioned_syms
        case "x$MK_SHARED_LIB" in
        *-Wl,*) #(vi
-               VERSIONED_SYMS="-Wl,--version-script,$with_versioned_syms"
+               VERSIONED_SYMS="-Wl,--version-script,\$(RESULTING_SYMS)"
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\[$]{VERSIONED_SYMS} -Wl,%"`
                CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
                ;;
        *-dy*) #(vi
-               VERSIONED_SYMS="-Wl,-M,$with_versioned_syms"
+               VERSIONED_SYMS="-Wl,-M,\$(RESULTING_SYMS)"
                MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\[$]{VERSIONED_SYMS} -dy%"`
                CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
                ;;
@@ -7395,6 +7412,8 @@ then
                ;;
        esac
 fi
+AC_SUBST(RESULTING_SYMS)
+AC_SUBST(VERSIONED_SYMS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14