[You must run `autoreconf-dickey -f` after this commit.] I found the old name unclear, and confusingly similar to `LIB_SUFFIX`, which refers (at least sometimes) to a differnt part of the file name, such as ".a" or ".la" (see `CF_WITH_LIBTOOL` in aclocal.m4).
`USE_LIB_SUFFIX` appeared to correspond to the version-independent
configuration options `--enable-widec` and `--with-pthread`, which I
think the new name more closely reflects.
* Ada95/configure.in:
* Ada95/src/library.gpr.in:
* aclocal.m4:
* c++/Makefile.in:
* configure.in:
* form/Makefile.in:
* menu/Makefile.in:
* misc/ncurses-config.in:
* mk-1st.awk:
* panel/Makefile.in: Do it.
---
Ada95/configure.in | 4 ++--
Ada95/src/library.gpr.in | 2 +-
aclocal.m4 | 28 ++++++++++++++--------------
c++/Makefile.in | 14 +++++++-------
configure.in | 16 ++++++++--------
form/Makefile.in | 2 +-
menu/Makefile.in | 2 +-
misc/ncurses-config.in | 2 +-
mk-1st.awk | 18 +++++++++---------
panel/Makefile.in | 2 +-
10 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/Ada95/configure.in b/Ada95/configure.in
index 1879e6401..b5e603fb5 100644
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -512,8 +512,8 @@ fi
USE_ARG_SUFFIX=${DFT_ARG_SUFFIX}
AC_SUBST(USE_ARG_SUFFIX)
-USE_LIB_SUFFIX=${DFT_ARG_SUFFIX}
-AC_SUBST(USE_LIB_SUFFIX)
+ABI_SUFFIX=${DFT_ARG_SUFFIX}
+AC_SUBST(ABI_SUFFIX)
USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}
AC_SUBST(USE_CFG_SUFFIX)
diff --git a/Ada95/src/library.gpr.in b/Ada95/src/library.gpr.in
index 37cbb9d93..908127ccd 100644
--- a/Ada95/src/library.gpr.in
+++ b/Ada95/src/library.gpr.in
@@ -43,7 +43,7 @@ project AdaCurses is
for Source_Dirs use (Source_Dir & "/src",
Source_Dir2,
Build_Dir & "/src");
- -- for Library_Options use ("-lncurses@USE_LIB_SUFFIX@",
"-lpanel@USE_LIB_SUFFIX@", "-lmenu@USE_LIB_SUFFIX@", "-lform@USE_LIB_SUFFIX@");
+ -- for Library_Options use ("-lncurses@ABI_SUFFIX@", "-lpanel@ABI_SUFFIX@",
"-lmenu@ABI_SUFFIX@", "-lform@ABI_SUFFIX@");
package Compiler is
for Default_Switches ("Ada") use
("-g",
diff --git a/aclocal.m4 b/aclocal.m4
index f74292347..38b69f9ab 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4836,7 +4836,7 @@ CF_EOF
if test "$cf_item" = shared ; then
if test -n "${LIB_SUFFIX}"
then
- cf_shared_suffix=`echo "$cf_suffix" |
sed 's/^'"${USE_LIB_SUFFIX}"'//'`
+ cf_shared_suffix=`echo "$cf_suffix" |
sed 's/^'"${ABI_SUFFIX}"'//'`
else
cf_shared_suffix="$cf_suffix"
fi
@@ -4857,16 +4857,16 @@ CF_EOF
case "$cf_cv_system_name" in
(darwin*)
# "w", etc?
-
cf_suffix="${USE_LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix"
+
cf_suffix="${ABI_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix"
;;
(*)
cf_suffix="$cf_suffix"'.${'$cf_version_name'}'
;;
esac
fi
- if test -n "${USE_LIB_SUFFIX}"
+ if test -n "${ABI_SUFFIX}"
then
- cf_shared_suffix=`echo
"$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`
+ cf_shared_suffix=`echo
"$cf_suffix" | sed 's/^'"${ABI_SUFFIX}"'//'`
else
cf_shared_suffix="$cf_suffix"
fi
@@ -4918,10 +4918,10 @@ CF_EOF
cf_add_lib=
case "$cf_l_parts" in
(*termlib*)
- cf_add_lib=`echo "$cf_liblist"
|sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+ cf_add_lib=`echo "$cf_liblist"
|sed -e s%${LIB_NAME}${ABI_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
;;
(*ticlib*)
- cf_add_lib=`echo "$cf_liblist"
|sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+ cf_add_lib=`echo "$cf_liblist"
|sed -e s%${LIB_NAME}${ABI_SUFFIX}%${TICS_LIB_SUFFIX}%g`
;;
(*)
break
@@ -5004,7 +5004,7 @@ CF_EOF
if test "$cf_dir" = ncurses ; then
case "$cf_subset" in
(*base*)
- cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ cf_libname=${cf_libname}$ABI_SUFFIX
;;
(*termlib*)
cf_libname=$TINFO_LIB_SUFFIX
@@ -5015,14 +5015,14 @@ CF_EOF
esac
elif test "$cf_dir" = c++ ; then
CF_MAP_LIB_BASENAME(cf_libname,cxx)
- cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ cf_libname=${cf_libname}$ABI_SUFFIX
else
CF_MAP_LIB_BASENAME(cf_libname,$cf_dir)
- cf_libname=${cf_libname}$USE_LIB_SUFFIX
+ cf_libname=${cf_libname}$ABI_SUFFIX
fi
if test -n "${USE_ARG_SUFFIX}" ; then
- # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX
- cf_suffix=`echo "$cf_suffix" |sed -e
"s%^${USE_LIB_SUFFIX}%%"`
+ # undo $ABI_SUFFIX add-on in CF_LIB_SUFFIX
+ cf_suffix=`echo "$cf_suffix" |sed -e
"s%^${ABI_SUFFIX}%%"`
fi
# These dependencies really are for development, not
@@ -5043,8 +5043,8 @@ CF_EOF
cf_dir_suffix=
old_cf_suffix="$cf_suffix"
if test "$cf_cv_shlib_version_infix" = yes ; then
- if test -n "$USE_LIB_SUFFIX" ; then
- case "$USE_LIB_SUFFIX" in
+ if test -n "$ABI_SUFFIX" ; then
+ case "$ABI_SUFFIX" in
(tw*)
cf_libname=`echo "$cf_libname" | sed
's/tw'$EXTRA_SUFFIX'$//'`
cf_suffix=`echo "$cf_suffix" | sed
's/^tw'$EXTRA_SUFFIX'//'`
@@ -5074,8 +5074,8 @@ CF_EOF
traces=$LIB_TRACING \
MODEL=$cf_ITEM \
CXX_MODEL=$CXX_MODEL \
+ ABI_SUFFIX=$ABI_SUFFIX \
LIB_SUFFIX=$LIB_SUFFIX \
- USE_LIB_SUFFIX=$USE_LIB_SUFFIX \
make_phony="${cf_cv_make_PHONY:-no}" \
model=$cf_subdir \
prefix=$cf_prefix \
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 6b1226853..11ebcae5b 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -116,15 +116,15 @@ LOCAL_LIBDIR = @top_builddir@/lib
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
SHLIB_DIRS = -L../lib
SHLIB_LIST = $(SHLIB_DIRS) \
- -l@FORM_NAME@@USE_LIB_SUFFIX@ \
- -l@MENU_NAME@@USE_LIB_SUFFIX@ \
- -l@PANEL_NAME@@USE_LIB_SUFFIX@ \
- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+ -l@FORM_NAME@@ABI_SUFFIX@ \
+ -l@MENU_NAME@@ABI_SUFFIX@ \
+ -l@PANEL_NAME@@ABI_SUFFIX@ \
+ -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
LIBROOT = ncurses++
-LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@[email protected]
-LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@[email protected]
+LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@[email protected]
+LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@[email protected]
LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
LIBRARIES = @Libs_To_Make@
@@ -133,7 +133,7 @@ LINT = @LINT@
LINT_OPTS = @LINT_OPTS@
LINT_LIBS = -lncurses @LIBS@
-LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@USE_LIB_SUFFIX@
+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@ABI_SUFFIX@
RPATH_LIST = @RPATH_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@
diff --git a/configure.in b/configure.in
index 59875b22b..c2d28b4dd 100644
--- a/configure.in
+++ b/configure.in
@@ -2168,7 +2168,7 @@ if test "x$with_dlsym" = xyes ; then
fi
USE_ARG_SUFFIX="${DFT_ARG_SUFFIX}${EXTRA_SUFFIX}"
-USE_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}"
+ABI_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}"
USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}${cf_cv_abi_version}
if test -n "$EXTRA_SUFFIX" && test "x$EXTRA_SUFFIX" != "x${cf_cv_abi_version}"
then
@@ -2176,13 +2176,13 @@ then
fi
AC_SUBST(USE_ARG_SUFFIX)
AC_SUBST(USE_CFG_SUFFIX)
-AC_SUBST(USE_LIB_SUFFIX)
+AC_SUBST(ABI_SUFFIX)
if test "$with_ticlib" != no ; then
if test "x$with_ticlib" != xyes ; then
TICS_NAME=$with_ticlib
- TICS_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e
"s/^${USE_LIB_SUFFIX}//"`"
+ TICS_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e
"s/^${ABI_SUFFIX}//"`"
TICS_ARG_SUFFIX="${with_ticlib}`echo "${USE_ARG_SUFFIX}" |sed
-e "s/^${LIB_SUFFIX}//"`"
TICS_DEP_SUFFIX="${with_ticlib}`echo "${DFT_DEP_SUFFIX}" |sed
-e "s/^${LIB_SUFFIX}//"`"
TICS_LIB_SUFFIX="${with_ticlib}"
@@ -2190,7 +2190,7 @@ if test "$with_ticlib" != no ; then
TICS_SUFFIX=${DFT_LIB_SUFFIX}
TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
+ TICS_LIB_SUFFIX="${TICS_NAME}${ABI_SUFFIX}"
fi
TICS_LDFLAGS="-L${LIB_DIR}"
TICS_LIBS="-l${TICS_ARG_SUFFIX}"
@@ -2209,7 +2209,7 @@ if test "$with_termlib" != no ; then
if test "x$with_termlib" != xyes ; then
TINFO_NAME=$with_termlib
- TINFO_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e
"s/^${USE_LIB_SUFFIX}//"`"
+ TINFO_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e
"s/^${ABI_SUFFIX}//"`"
TINFO_ARG_SUFFIX="${with_termlib}`echo "${USE_ARG_SUFFIX}" |sed
-e "s/^${LIB_SUFFIX}//"`"
TINFO_DEP_SUFFIX="${with_termlib}`echo "${DFT_DEP_SUFFIX}" |sed
-e "s/^${LIB_SUFFIX}//"`"
TINFO_LIB_SUFFIX="${with_termlib}"
@@ -2217,7 +2217,7 @@ if test "$with_termlib" != no ; then
TINFO_SUFFIX=${DFT_LIB_SUFFIX}
TINFO_ARG_SUFFIX="${TINFO_NAME}${USE_ARG_SUFFIX}"
TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
- TINFO_LIB_SUFFIX="${TINFO_NAME}${USE_LIB_SUFFIX}"
+ TINFO_LIB_SUFFIX="${TINFO_NAME}${ABI_SUFFIX}"
fi
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_DEP_SUFFIX}"
@@ -2298,7 +2298,7 @@ if test "$with_overwrite" = no && \
{ test "x$includedir" = 'x${prefix}/include' || \
test "x$includedir" = "x${prefix}/include"; }
then
- includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ includesubdir="/ncurses${ABI_SUFFIX}"
fi
AC_MSG_RESULT(${includedir}${includesubdir})
@@ -2601,7 +2601,7 @@ TINFO_SUFFIX="$TINFO_SUFFIX"
UNALTERED_SYMS="$UNALTERED_SYMS"
USE_ARG_SUFFIX="$USE_ARG_SUFFIX"
USE_CFG_SUFFIX="$USE_CFG_SUFFIX"
-USE_LIB_SUFFIX="$USE_LIB_SUFFIX"
+ABI_SUFFIX="$ABI_SUFFIX"
USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
WILDCARD_SYMS="$WILDCARD_SYMS"
WITH_CURSES_H="$with_curses_h"
diff --git a/form/Makefile.in b/form/Makefile.in
index d8e695116..a87d6e740 100644
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -115,7 +115,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
diff --git a/menu/Makefile.in b/menu/Makefile.in
index ef5644d7f..d171b928a 100644
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -115,7 +115,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index c671407cd..4a8f5c2be 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -46,7 +46,7 @@ datarootdir="@datarootdir@"
datadir="@datadir@"
mandir="@mandir@"
-THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
+THIS="@LIB_NAME@@ABI_SUFFIX@"
TINFO_LIB="@TINFO_ARG_SUFFIX@"
RPATH_LIST="@RPATH_LIST@"
diff --git a/mk-1st.awk b/mk-1st.awk
index 0b37f74dc..0d561fb09 100644
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -37,7 +37,7 @@
# MODEL (e.g., "DEBUG", uppercase; toupper is not portable)
# CXX_MODEL (e.g., "DEBUG", uppercase)
# LIB_SUFFIX (e.g., "", "w", "t", "tw")
-# USE_LIB_SUFFIX (e.g., "", "w", "t", "tw")
+# ABI_SUFFIX (e.g., "", "w", "t", "tw")
# model (directory into which we compile, e.g., "obj")
# prefix (e.g., "lib", for Unix-style libraries)
# suffix (e.g., "_g.a", for debug libraries)
@@ -270,10 +270,10 @@ function in_subset(value) {
return index(check,value);
}
function trim_suffix(value) {
- if (USE_LIB_SUFFIX != "" && length(value) > length(USE_LIB_SUFFIX)) {
- check = substr(value, 1 + length(value) -
length(USE_LIB_SUFFIX));
- if (check == USE_LIB_SUFFIX) {
- value = substr(value, 1, length(value) -
length(USE_LIB_SUFFIX));
+ if (ABI_SUFFIX != "" && length(value) > length(ABI_SUFFIX)) {
+ check = substr(value, 1 + length(value) - length(ABI_SUFFIX));
+ if (check == ABI_SUFFIX) {
+ value = substr(value, 1, length(value) -
length(ABI_SUFFIX));
}
}
return value;
@@ -308,7 +308,7 @@ BEGIN {
printf "# MODEL: %s\n", MODEL
printf "# CXX_MODEL: %s\n",
CXX_MODEL
printf "# LIB_SUFFIX: %s\n",
LIB_SUFFIX
- printf "# USE_LIB_SUFFIX: %s\n",
USE_LIB_SUFFIX
+ printf "# ABI_SUFFIX: %s\n",
ABI_SUFFIX
printf "# model: %s\n", model
printf "# prefix: %s\n",
prefix
printf "# suffix: %s\n",
suffix
@@ -473,12 +473,12 @@ END {
else if ( MODEL == "LIBTOOL" )
{
end_name = lib_name;
- use_name = trim_suffix(TermlibRoot)
USE_LIB_SUFFIX
+ use_name = trim_suffix(TermlibRoot) ABI_SUFFIX
printf "../lib/%s : \\\n", lib_name
if ( (name != use_name ) && ( index(name, "++")
== 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
printf "\t\t../lib/lib%s.la \\\n",
use_name;
if ( index(name, "tic") == 1 &&
index(TermlibRoot, "ncurses") != 1 ) {
- printf "\t\t../lib/lib%s%s.la
\\\n", "ncurses", USE_LIB_SUFFIX;
+ printf "\t\t../lib/lib%s%s.la
\\\n", "ncurses", ABI_SUFFIX;
}
}
printf "\t\t$(%s_OBJS)\n", OBJS
@@ -502,7 +502,7 @@ END {
print "install.libs \\"
printf "install.%s :: \\\n", trim_suffix(name);
printf "\t\t$(LIBDIR) \\\n";
- use_name = TermlibRoot USE_LIB_SUFFIX
+ use_name = TermlibRoot ABI_SUFFIX
if ( (name != use_name ) && ( index(name, "++")
== 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
if ( trim_suffix(TermlibRoot) !=
trim_suffix(name) ) {
printf "\t\tinstall.%s \\\n",
trim_suffix(TermlibRoot);
diff --git a/panel/Makefile.in b/panel/Makefile.in
index dbb245a18..750a6f7ba 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -117,7 +117,7 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@ABI_SUFFIX@ @SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
--
2.30.2
signature.asc
Description: PGP signature
