regenerated

1 files changed, 7 insertions, 51 deletions

diff --git a/configure b/configure
index d948dfb7..c396f51f 100755
--- a/configure
+++ b/configure
@@ -3442,57 +3442,12 @@ $as_echo "$as_me: WARNING: You need 'autogen' to run configure for GCC properly!
    missing="${missing} autogen"
 fi
 
+#AC_CHECK_LIB(ncurses, doupdate)
+#if test x${ac_cv_lib_ncurses_doupdate} != x"yes"; then
+#   AC_MSG_WARN([You need 'libncurses' to run configure for GDB properly!])
+#   missing="${missing} libncurses5-dev"
+#fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for doupdate in -lncurses" >&5
-$as_echo_n "checking for doupdate in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_doupdate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char doupdate ();
-int
-main ()
-{
-return doupdate ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ncurses_doupdate=yes
-else
-  ac_cv_lib_ncurses_doupdate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_doupdate" >&5
-$as_echo "$ac_cv_lib_ncurses_doupdate" >&6; }
-if test "x$ac_cv_lib_ncurses_doupdate" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNCURSES 1
-_ACEOF
-
-  LIBS="-lncurses $LIBS"
-
-fi
-
-if test x${ac_cv_lib_ncurses_doupdate} != x"yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need 'libncurses' to run configure for GDB properly!" >&5
-$as_echo "$as_me: WARNING: You need 'libncurses' to run configure for GDB properly!" >&2;}
-   missing="${missing} libncurses5-dev"
-fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
 $as_echo_n "checking for gzread in -lz... " >&6; }
 if ${ac_cv_lib_z_gzread+:} false; then :
@@ -3548,7 +3503,7 @@ result=$?
 if test ${result} -eq 0; then
     # add Ubuntu specific packages
     if test x"${BUILD_ARCH}" != xaarch64; then
-       packages="${packages} gcc-multilib g++-multilib"
+       packages="${packages} gcc-multilib g++-multilib libncurses5-dev"
     fi
     for i in ${packages}; do
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
@@ -3570,6 +3525,7 @@ else
 yum="`which yum 2> /dev/null`"
 result=$?
 if test ${result} -eq 0; then
+    packages="${packages} ncurses-devel"
     for i in ${packages}; do
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i is installed" >&5
 $as_echo_n "checking if $i is installed... " >&6; }