1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

autoconf: fix some "obsolete function" warnings with newer (2.7x) autoconfs

We also now require at least autoconf 2.69 - which should be fine as
it was released in 2012.
This commit is contained in:
Jon Trulson 2021-12-18 14:15:25 -07:00
parent 73cf4157b5
commit c3c7d8303b
3 changed files with 26 additions and 31 deletions

View file

@ -23,6 +23,12 @@ AC_SUBST(CDE_VERSION_MINOR)
AC_SUBST(CDE_VERSION_MICRO) AC_SUBST(CDE_VERSION_MICRO)
AC_SUBST(CDE_VERSION_DEV) AC_SUBST(CDE_VERSION_DEV)
dnl released in 2012, this should be sufficient
AC_PREREQ([2.69])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
dnl These must be up here for the compiler search list to actually work dnl These must be up here for the compiler search list to actually work
AC_PROG_CC([cc gcc clang]) AC_PROG_CC([cc gcc clang])
AC_PROG_CXX([c++ g++ clang++]) AC_PROG_CXX([c++ g++ clang++])
@ -30,16 +36,9 @@ AC_PROG_CXX([c++ g++ clang++])
LT_INIT LT_INIT
AC_PREFIX_DEFAULT(/usr/dt) AC_PREFIX_DEFAULT(/usr/dt)
AC_ENABLE_STATIC([no])
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
dnl todo: determine what version of autoconf we depend on
dnl AC_PREREQ()
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
dnl SOURCE_DEFINES - start with CDE project default dnl SOURCE_DEFINES - start with CDE project default
SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16" SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16"
@ -83,7 +82,7 @@ EXTRA_INCS=""
# pam currently only works on netbsd (9.2 tested) and linux # pam currently only works on netbsd (9.2 tested) and linux
supports_pam=no supports_pam=no
case "${host_os}" in case "${build_os}" in
linux*) linux*)
build_linux=yes build_linux=yes
OSMAJORVERSION=4 OSMAJORVERSION=4
@ -281,7 +280,7 @@ dnl do. This is not a replacement for cpp, used at runtime by
dnl software such as tt_type_comp. dnl software such as tt_type_comp.
AC_SUBST(GENCPP, '$(top_builddir)/util/tradcpp/tradcpp') AC_SUBST(GENCPP, '$(top_builddir)/util/tradcpp/tradcpp')
AM_PROG_LIBTOOL LT_INIT
dnl make sure it's installed dnl make sure it's installed
AC_PROG_YACC AC_PROG_YACC
@ -289,7 +288,7 @@ if test -z "$ac_cv_prog_YACC"; then
MISSING_PROGS="[bison or byacc] ${MISSING_PROGS}" MISSING_PROGS="[bison or byacc] ${MISSING_PROGS}"
fi fi
AM_PROG_LEX AC_PROG_LEX(noyywrap)
if test -z "$ac_cv_prog_LEX"; then if test -z "$ac_cv_prog_LEX"; then
MISSING_PROGS="[flex or lex] ${MISSING_PROGS}" MISSING_PROGS="[flex or lex] ${MISSING_PROGS}"
fi fi
@ -308,14 +307,11 @@ AC_C_CONST
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_C_INLINE AC_C_INLINE
AC_C_CHAR_UNSIGNED AC_C_CHAR_UNSIGNED
AC_C_STRINGIZE
AC_C_FLEXIBLE_ARRAY_MEMBER AC_C_FLEXIBLE_ARRAY_MEMBER
AC_SYS_POSIX_TERMIOS AC_SYS_POSIX_TERMIOS
AX_PTHREAD AX_PTHREAD
AC_PROG_CC_C99
AC_PATH_X AC_PATH_X
AC_PATH_XTRA AC_PATH_XTRA
@ -406,7 +402,6 @@ dnl Used to check if program 'tic' is available to install terminfo files
AC_CHECK_PROGS(TIC, tic, :) AC_CHECK_PROGS(TIC, tic, :)
dnl headers dnl headers
AC_HEADER_STDC
AC_CHECK_HEADERS([locale.h security/pam_appl.h utempter.h]) AC_CHECK_HEADERS([locale.h security/pam_appl.h utempter.h])
dnl libraries dnl libraries

View file

@ -294,7 +294,7 @@ if test "x$ax_pthread_clang" = "xyes"; then
# step # step
ax_pthread_save_ac_link="$ac_link" ax_pthread_save_ac_link="$ac_link"
ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` ax_pthread_link_step=`echo "$ac_link" | sed "$ax_pthread_sed"`
ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
ax_pthread_save_CFLAGS="$CFLAGS" ax_pthread_save_CFLAGS="$CFLAGS"
for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do

View file

@ -28,7 +28,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
# we reset no_tcl in case something fails here # we reset no_tcl in case something fails here
no_tcl=true no_tcl=true
AC_ARG_WITH(tcl, AC_ARG_WITH(tcl,
AC_HELP_STRING([--with-tcl], AS_HELP_STRING([--with-tcl],
[directory containing tcl configuration (tclConfig.sh)]), [directory containing tcl configuration (tclConfig.sh)]),
with_tclconfig="${withval}") with_tclconfig="${withval}")
AC_MSG_CHECKING([for Tcl configuration]) AC_MSG_CHECKING([for Tcl configuration])
@ -159,7 +159,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
# we reset no_tk in case something fails here # we reset no_tk in case something fails here
no_tk=true no_tk=true
AC_ARG_WITH(tk, AC_ARG_WITH(tk,
AC_HELP_STRING([--with-tk], AS_HELP_STRING([--with-tk],
[directory containing tk configuration (tkConfig.sh)]), [directory containing tk configuration (tkConfig.sh)]),
with_tkconfig="${withval}") with_tkconfig="${withval}")
AC_MSG_CHECKING([for Tk configuration]) AC_MSG_CHECKING([for Tk configuration])
@ -528,7 +528,7 @@ AC_DEFUN([SC_BUILD_TCLSH], [
AC_DEFUN([SC_ENABLE_SHARED], [ AC_DEFUN([SC_ENABLE_SHARED], [
AC_MSG_CHECKING([how to build libraries]) AC_MSG_CHECKING([how to build libraries])
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
AC_HELP_STRING([--enable-shared], AS_HELP_STRING([--enable-shared],
[build and link with shared libraries (default: on)]), [build and link with shared libraries (default: on)]),
[tcl_ok=$enableval], [tcl_ok=yes]) [tcl_ok=$enableval], [tcl_ok=yes])
@ -570,7 +570,7 @@ AC_DEFUN([SC_ENABLE_FRAMEWORK], [
if test "`uname -s`" = "Darwin" ; then if test "`uname -s`" = "Darwin" ; then
AC_MSG_CHECKING([how to package libraries]) AC_MSG_CHECKING([how to package libraries])
AC_ARG_ENABLE(framework, AC_ARG_ENABLE(framework,
AC_HELP_STRING([--enable-framework], AS_HELP_STRING([--enable-framework],
[package shared libraries in MacOSX frameworks (default: off)]), [package shared libraries in MacOSX frameworks (default: off)]),
[enable_framework=$enableval], [enable_framework=no]) [enable_framework=$enableval], [enable_framework=no])
if test $enable_framework = yes; then if test $enable_framework = yes; then
@ -621,7 +621,7 @@ AC_DEFUN([SC_ENABLE_FRAMEWORK], [
AC_DEFUN([SC_ENABLE_THREADS], [ AC_DEFUN([SC_ENABLE_THREADS], [
AC_ARG_ENABLE(threads, AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads], AS_HELP_STRING([--enable-threads],
[build with threads (default: on)]), [build with threads (default: on)]),
[tcl_ok=$enableval], [tcl_ok=yes]) [tcl_ok=$enableval], [tcl_ok=yes])
@ -737,7 +737,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_DEFUN([SC_ENABLE_SYMBOLS], [
AC_MSG_CHECKING([for build with symbols]) AC_MSG_CHECKING([for build with symbols])
AC_ARG_ENABLE(symbols, AC_ARG_ENABLE(symbols,
AC_HELP_STRING([--enable-symbols], AS_HELP_STRING([--enable-symbols],
[build with debugging symbols (default: off)]), [build with debugging symbols (default: off)]),
[tcl_ok=$enableval], [tcl_ok=no]) [tcl_ok=$enableval], [tcl_ok=no])
# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT. # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
@ -797,7 +797,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
AC_DEFUN([SC_ENABLE_LANGINFO], [ AC_DEFUN([SC_ENABLE_LANGINFO], [
AC_ARG_ENABLE(langinfo, AC_ARG_ENABLE(langinfo,
AC_HELP_STRING([--enable-langinfo], AS_HELP_STRING([--enable-langinfo],
[use nl_langinfo if possible to determine encoding at startup, otherwise use old heuristic (default: on)]), [use nl_langinfo if possible to determine encoding at startup, otherwise use old heuristic (default: on)]),
[langinfo_ok=$enableval], [langinfo_ok=yes]) [langinfo_ok=$enableval], [langinfo_ok=yes])
@ -849,7 +849,7 @@ AC_DEFUN([SC_ENABLE_LANGINFO], [
AC_DEFUN([SC_CONFIG_MANPAGES], [ AC_DEFUN([SC_CONFIG_MANPAGES], [
AC_MSG_CHECKING([whether to use symlinks for manpages]) AC_MSG_CHECKING([whether to use symlinks for manpages])
AC_ARG_ENABLE(man-symlinks, AC_ARG_ENABLE(man-symlinks,
AC_HELP_STRING([--enable-man-symlinks], AS_HELP_STRING([--enable-man-symlinks],
[use symlinks for the manpages (default: off)]), [use symlinks for the manpages (default: off)]),
test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks", test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks",
enableval="no") enableval="no")
@ -857,7 +857,7 @@ AC_DEFUN([SC_CONFIG_MANPAGES], [
AC_MSG_CHECKING([whether to compress the manpages]) AC_MSG_CHECKING([whether to compress the manpages])
AC_ARG_ENABLE(man-compression, AC_ARG_ENABLE(man-compression,
AC_HELP_STRING([--enable-man-compression=PROG], AS_HELP_STRING([--enable-man-compression=PROG],
[compress the manpages with PROG (default: off)]), [compress the manpages with PROG (default: off)]),
[case $enableval in [case $enableval in
yes) AC_MSG_ERROR([missing argument to --enable-man-compression]);; yes) AC_MSG_ERROR([missing argument to --enable-man-compression]);;
@ -878,7 +878,7 @@ AC_DEFUN([SC_CONFIG_MANPAGES], [
AC_MSG_CHECKING([whether to add a package name suffix for the manpages]) AC_MSG_CHECKING([whether to add a package name suffix for the manpages])
AC_ARG_ENABLE(man-suffix, AC_ARG_ENABLE(man-suffix,
AC_HELP_STRING([--enable-man-suffix=STRING], AS_HELP_STRING([--enable-man-suffix=STRING],
[use STRING as a suffix to manpage file names (default: no, AC_PACKAGE_NAME if enabled without specifying STRING)]), [use STRING as a suffix to manpage file names (default: no, AC_PACKAGE_NAME if enabled without specifying STRING)]),
[case $enableval in [case $enableval in
yes) enableval="AC_PACKAGE_NAME" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";; yes) enableval="AC_PACKAGE_NAME" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
@ -1029,7 +1029,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
AC_MSG_CHECKING([if 64bit support is requested]) AC_MSG_CHECKING([if 64bit support is requested])
AC_ARG_ENABLE(64bit, AC_ARG_ENABLE(64bit,
AC_HELP_STRING([--enable-64bit], AS_HELP_STRING([--enable-64bit],
[enable 64bit support (default: off)]), [enable 64bit support (default: off)]),
[do64bit=$enableval], [do64bit=no]) [do64bit=$enableval], [do64bit=no])
AC_MSG_RESULT([$do64bit]) AC_MSG_RESULT([$do64bit])
@ -1038,7 +1038,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
AC_MSG_CHECKING([if 64bit Sparc VIS support is requested]) AC_MSG_CHECKING([if 64bit Sparc VIS support is requested])
AC_ARG_ENABLE(64bit-vis, AC_ARG_ENABLE(64bit-vis,
AC_HELP_STRING([--enable-64bit-vis], AS_HELP_STRING([--enable-64bit-vis],
[enable 64bit Sparc VIS support (default: off)]), [enable 64bit Sparc VIS support (default: off)]),
[do64bitVIS=$enableval], [do64bitVIS=no]) [do64bitVIS=$enableval], [do64bitVIS=no])
AC_MSG_RESULT([$do64bitVIS]) AC_MSG_RESULT([$do64bitVIS])
@ -1067,7 +1067,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
AC_MSG_CHECKING([if rpath support is requested]) AC_MSG_CHECKING([if rpath support is requested])
AC_ARG_ENABLE(rpath, AC_ARG_ENABLE(rpath,
AC_HELP_STRING([--disable-rpath], AS_HELP_STRING([--disable-rpath],
[disable rpath support (default: on)]), [disable rpath support (default: on)]),
[doRpath=$enableval], [doRpath=yes]) [doRpath=$enableval], [doRpath=yes])
AC_MSG_RESULT([$doRpath]) AC_MSG_RESULT([$doRpath])
@ -1632,7 +1632,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
PLAT_SRCS='${MAC_OSX_SRCS}' PLAT_SRCS='${MAC_OSX_SRCS}'
AC_MSG_CHECKING([whether to use CoreFoundation]) AC_MSG_CHECKING([whether to use CoreFoundation])
AC_ARG_ENABLE(corefoundation, AC_ARG_ENABLE(corefoundation,
AC_HELP_STRING([--enable-corefoundation], AS_HELP_STRING([--enable-corefoundation],
[use CoreFoundation API on MacOSX (default: on)]), [use CoreFoundation API on MacOSX (default: on)]),
[tcl_corefoundation=$enableval], [tcl_corefoundation=yes]) [tcl_corefoundation=$enableval], [tcl_corefoundation=yes])
AC_MSG_RESULT([$tcl_corefoundation]) AC_MSG_RESULT([$tcl_corefoundation])
@ -1986,7 +1986,7 @@ dnl # preprocessing tests use only CPPFLAGS.
# Step 4: disable dynamic loading if requested via a command-line switch. # Step 4: disable dynamic loading if requested via a command-line switch.
AC_ARG_ENABLE(load, AC_ARG_ENABLE(load,
AC_HELP_STRING([--enable-load], AS_HELP_STRING([--enable-load],
[allow dynamic loading and "load" command (default: on)]), [allow dynamic loading and "load" command (default: on)]),
[tcl_ok=$enableval], [tcl_ok=yes]) [tcl_ok=$enableval], [tcl_ok=yes])
AS_IF([test "$tcl_ok" = no], [DL_OBJS=""]) AS_IF([test "$tcl_ok" = no], [DL_OBJS=""])
@ -2666,7 +2666,7 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
AC_DEFUN([SC_TCL_CFG_ENCODING], [ AC_DEFUN([SC_TCL_CFG_ENCODING], [
AC_ARG_WITH(encoding, AC_ARG_WITH(encoding,
AC_HELP_STRING([--with-encoding], AS_HELP_STRING([--with-encoding],
[encoding for configuration values (default: iso8859-1)]), [encoding for configuration values (default: iso8859-1)]),
with_tcencoding=${withval}) with_tcencoding=${withval})