mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 9.1.0452: Configure checks for libelf unnecessarily
Problem: Configure checks for libelf unnecessarily Solution: Remove configure check (youcai) closes: #14879 Signed-off-by: youcai <omegacoleman@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
88c8c547d5
commit
1acc67ac44
@@ -4402,7 +4402,6 @@ Code size:
|
|||||||
left out.
|
left out.
|
||||||
8 When compiled with a GUI-only version, the termcap entries for terminals
|
8 When compiled with a GUI-only version, the termcap entries for terminals
|
||||||
can be removed.
|
can be removed.
|
||||||
8 Can the check for libelf in configure.ac be removed?
|
|
||||||
|
|
||||||
|
|
||||||
Messages:
|
Messages:
|
||||||
|
49
src/auto/configure
vendored
49
src/auto/configure
vendored
@@ -11407,55 +11407,6 @@ printf "%s\n" "no" >&6; }
|
|||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
|
|
||||||
ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_elf_h" = xyes
|
|
||||||
then :
|
|
||||||
HAS_ELF=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$HAS_ELF" = 1; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5
|
|
||||||
printf %s "checking for main in -lelf... " >&6; }
|
|
||||||
if test ${ac_cv_lib_elf_main+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lelf $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
return main ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
ac_cv_lib_elf_main=yes
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_lib_elf_main=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5
|
|
||||||
printf "%s\n" "$ac_cv_lib_elf_main" >&6; }
|
|
||||||
if test "x$ac_cv_lib_elf_main" = xyes
|
|
||||||
then :
|
|
||||||
printf "%s\n" "#define HAVE_LIBELF 1" >>confdefs.h
|
|
||||||
|
|
||||||
LIBS="-lelf $LIBS"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
ac_header_dirent=no
|
ac_header_dirent=no
|
||||||
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
|
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
|
||||||
as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
|
as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
|
||||||
|
@@ -3307,13 +3307,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [int x __attribute__((u
|
|||||||
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED),
|
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_ATTRIBUTE_UNUSED),
|
||||||
AC_MSG_RESULT(no))
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
dnl Checks for header files.
|
|
||||||
AC_CHECK_HEADER(elf.h, HAS_ELF=1)
|
|
||||||
dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
|
|
||||||
if test "$HAS_ELF" = 1; then
|
|
||||||
AC_CHECK_LIB(elf, main)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_HEADER_DIRENT
|
AC_HEADER_DIRENT
|
||||||
|
|
||||||
dnl If sys/wait.h is not found it might still exist but not be POSIX
|
dnl If sys/wait.h is not found it might still exist but not be POSIX
|
||||||
|
@@ -53,7 +53,7 @@ else
|
|||||||
if sh link_$PROG.cmd; then
|
if sh link_$PROG.cmd; then
|
||||||
touch auto/link.sed
|
touch auto/link.sed
|
||||||
cp link_$PROG.cmd linkit_$PROG.sh
|
cp link_$PROG.cmd linkit_$PROG.sh
|
||||||
for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
|
for libname in SM ICE nsl dnet dnet_stub inet socket dir iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
|
||||||
cont=yes
|
cont=yes
|
||||||
while test -n "$cont"; do
|
while test -n "$cont"; do
|
||||||
if grep "l$libname " linkit_$PROG.sh >/dev/null; then
|
if grep "l$libname " linkit_$PROG.sh >/dev/null; then
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
452,
|
||||||
/**/
|
/**/
|
||||||
451,
|
451,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user