Skip to content

Commit

Permalink
snapshot of project "ncurses", label v6_4_20231028
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomasDickey
ThomasDickey committed Oct 28, 2023
1 parent 4e3e1e5 commit 0daa37c
Show file tree
Hide file tree
Showing 27 changed files with 2,928 additions and 2,847 deletions.
54 changes: 30 additions & 24 deletions Ada95/aclocal.m4
View file
Expand Up @@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.203 2023/09/06 22:55:27 tom Exp $
dnl $Id: aclocal.m4,v 1.205 2023/10/28 16:05:04 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
Expand Down Expand Up @@ -3486,7 +3486,7 @@ case ".[$]$1" in
esac
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
dnl
Expand All @@ -3495,7 +3495,7 @@ AC_DEFUN([CF_PKG_CONFIG],
[
AC_MSG_CHECKING(if you want to use pkg-config)
AC_ARG_WITH(pkg-config,
[ --with-pkg-config{=path} enable/disable use of pkg-config],
[[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
[cf_pkg_config=$withval],
[cf_pkg_config=yes])
AC_MSG_RESULT($cf_pkg_config)
Expand Down Expand Up @@ -3973,7 +3973,7 @@ do
done
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34
dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
Expand Down Expand Up @@ -4019,9 +4019,9 @@ AC_DEFUN([CF_SHARED_OPTS],
cf_ld_rpath_opt=
test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
AC_MSG_CHECKING(if release/abi version should be used for shared libs)
AC_MSG_CHECKING(whether to use release or ABI version in shared library file names)
AC_ARG_WITH(shlib-version,
[ --with-shlib-version=X Specify rel or abi version for shared libs],
[[ --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]],
[test -z "$withval" && withval=auto
case "$withval" in
(yes)
Expand Down Expand Up @@ -4737,43 +4737,43 @@ weak_symbol(fopen);
])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58
dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
dnl --------------------
dnl Command-line option to specify the Ada95 compiler.
AC_DEFUN([CF_WITH_ADA_COMPILER],[
AC_MSG_CHECKING(for ada-compiler)
AC_MSG_CHECKING(for Ada95 compiler)
AC_ARG_WITH(ada-compiler,
[ --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)],
[[ --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]],
[cf_ada_compiler=$withval],
[cf_ada_compiler=gnatmake])
AC_SUBST(cf_ada_compiler)
AC_MSG_RESULT($cf_ada_compiler)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58
dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01
dnl -------------------
dnl Command-line option to specify where Ada includes will install.
AC_DEFUN([CF_WITH_ADA_INCLUDE],[
AC_MSG_CHECKING(for ada-include)
AC_MSG_CHECKING(for Ada95 include directory)
CF_WITH_PATH(ada-include,
[ --with-ada-include=DIR Ada includes are in DIR],
[ --with-ada-include=DIR find Ada95 includes in DIR],
ADA_INCLUDE,
PREFIX/share/ada/adainclude,
[$]prefix/share/ada/adainclude)
AC_SUBST(ADA_INCLUDE)
AC_MSG_RESULT($ADA_INCLUDE)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41
dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
dnl -------------------
dnl CF_WITH_ADA_LIBNAME
dnl -------------------
dnl Command-line option to specify how to name the resulting Ada library.
dnl $1 = default value
AC_DEFUN([CF_WITH_ADA_LIBNAME],[
AC_MSG_CHECKING(for ada-libname)
AC_MSG_CHECKING(for Ada95 curses library name)
AC_ARG_WITH(ada-libname,
[ --with-ada-libname=XXX override default Ada library-name],
[ --with-ada-libname=XXX use XXX as Ada95 library name],
ADA_LIBNAME=[$]withval,
ADA_LIBNAME=$1)
case "x$ADA_LIBNAME" in
Expand All @@ -4785,42 +4785,48 @@ AC_SUBST(ADA_LIBNAME)
AC_MSG_RESULT($ADA_LIBNAME)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58
dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01
dnl -------------------
dnl Command-line option to specify where Ada objects will install.
AC_DEFUN([CF_WITH_ADA_OBJECTS],[
AC_MSG_CHECKING(for ada-objects)
AC_MSG_CHECKING(for Ada95 object directory)
CF_WITH_PATH(ada-objects,
[ --with-ada-objects=DIR Ada objects are in DIR],
[ --with-ada-objects=DIR find Ada95 objects in DIR],
ADA_OBJECTS,
PREFIX/lib/ada/adalib,
[$]prefix/lib/ada/adalib)
AC_SUBST(ADA_OBJECTS)
AC_MSG_RESULT($ADA_OBJECTS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35
dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01
dnl ---------------------
dnl Command-line option to specify if an Ada95 shared-library should be built,
dnl Command-line option to specify if an Ada95 shared library should be built,
dnl and optionally what its soname should be.
AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
AC_REQUIRE([CF_GNAT_PROJECTS])
AC_MSG_CHECKING(if an Ada95 shared-library should be built)
AC_MSG_CHECKING(whether to build an Ada95 shared library)
AC_ARG_WITH(ada-sharedlib,
[ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
[ --with-ada-sharedlib build Ada95 shared library; requires GNAT project support],
[with_ada_sharedlib=$withval],
[with_ada_sharedlib=no])
AC_MSG_RESULT($with_ada_sharedlib)
cf_ada_sharedlib_warn=no
if test "x$with_ada_sharedlib" != xno
then
if test "x$cf_gnat_projects" != xyes
then
AC_MSG_WARN(disabling shared-library since GNAT projects are not supported)
with_ada_sharedlib=no
cf_ada_sharedlib_warn=yes
fi
fi
AC_MSG_RESULT($with_ada_sharedlib)
if test "x$cf_ada_sharedlib_warn" != xno
then
AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported)
fi
ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
MAKE_ADA_SHAREDLIB="#"
Expand Down

0 comments on commit 0daa37c

Please sign in to comment.