tools: drop bogus and obsolete ptyfuncs.m4

According to openpty(3) it is required to include <pty.h> to get the
prototypes for openpty() and login_tty(). But this is not what the
function AX_CHECK_PTYFUNCS actually does. It makes no attempt to include
the required header.

The two source files which call openpty() and login_tty() already contain
the conditionals to include the required header.

Remove the bogus m4 file to fix build with clang, which complains about
calls to undeclared functions.

Remove usage of INCLUDE_LIBUTIL_H in libxl_bootloader.c, it is already
covered by inclusion of libxl_osdep.h.

Remove usage of PTYFUNCS_LIBS in libxl/Makefile, it is already covered
by UTIL_LIBS from config/StdGNU.mk.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
This commit is contained in:
Olaf Hering authored and Andrew Cooper committed 2023-05-16 20:03:02 +01:00
1 parent 9d628ff6cc
commit 42abf5b9c5
7 files changed
+1 -115

No files matched your search

-68
View File
@@ -636,7 +636,6 @@ LIBNL3_LIBS
LIBNL3_CFLAGS
argp_ldflags
libiconv
PTYFUNCS_LIBS
PTHREAD_LIBS
PTHREAD_LDFLAGS
PTHREAD_CFLAGS
@@ -3747,8 +3746,6 @@ esac
# Fetched from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_compare_version.m4
# Commit ID: 27948f49ca30e4222bb7cdd55182bd7341ac50c5
# ===========================================================================
@@ -8988,71 +8985,6 @@ $as_echo "$ax_cv_pthread_flags" >&6; }
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Werror"
ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default"
if test "x$ac_cv_header_libutil_h" = xyes; then :
$as_echo "#define INCLUDE_LIBUTIL_H <libutil.h>" >>confdefs.h
fi
CPPFLAGS="$saved_CPPFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty et al" >&5
$as_echo_n "checking for openpty et al... " >&6; }
if ${ax_cv_ptyfuncs_libs+:} false; then :
$as_echo_n "(cached) " >&6
else
for ax_cv_ptyfuncs_libs in -lutil "" NOT_FOUND; do
if test "x$ax_cv_ptyfuncs_libs" = "xNOT_FOUND"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Unable to find library for openpty and login_tty
See \`config.log' for more details" "$LINENO" 5; }
fi
saved_LIBS="$LIBS"
LIBS="$LIBS $ax_cv_ptyfuncs_libs"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef INCLUDE_LIBUTIL_H
#include INCLUDE_LIBUTIL_H
#endif
int main(void) {
openpty(0,0,0,0,0);
login_tty(0);
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
break
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$saved_LIBS"
done
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ptyfuncs_libs" >&5
$as_echo "$ax_cv_ptyfuncs_libs" >&6; }
PTYFUNCS_LIBS="$ax_cv_ptyfuncs_libs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yajl_alloc in -lyajl" >&5
$as_echo_n "checking for yajl_alloc in -lyajl... " >&6; }
if ${ac_cv_lib_yajl_yajl_alloc+:} false; then :
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.