Attachment #595948 for bug #699972

View | Details | Raw Unified | Return to bug 699972
Collapse All | Expand All




++ b/configure.ac

    AC_CHECK_LIB($cf_ncurses, initscr,
        [LIBS="$LIBS -l$cf_ncurses"

         AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])

         if test "$cf_ncurses" = ncursesw; then
            AC_CHECK_LIB(tinfow, tgetent, [LIBS="$LIBS -ltinfow"])
            AC_CHECK_HEADERS([ncursesw/ncurses.h ncursesw/panel.h],,
                 [AC_CHECK_HEADERS([ncurses.h panel.h],,
                                   AC_MSG_ERROR([Missing header file]))])
         else
             AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
             AC_CHECK_HEADERS([ncurses/ncurses.h ncurses/panel.h],,
                 [AC_CHECK_HEADERS([ncurses.h panel.h],,
                                   AC_MSG_ERROR([Missing header file]))])
++ b/configure

if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
  LIBS="$LIBS -l$cf_ncurses"


         if test "$cf_ncurses" = ncursesw; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfow" >&5
$as_echo_n "checking for tgetent in -ltinfow... " >&6; }
if ${ac_cv_lib_tinfow_tgetent+:} false; then :
  $as_echo_n "(cached) " >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinfow  $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */


}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
  ac_cv_lib_tinfow_tgetent=yes
else
  ac_cv_lib_tinfow_tgetent=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_tinfow_tgetent" >&5
$as_echo "$ac_cv_lib_tinfow_tgetent" >&6; }
if test "x$ac_cv_lib_tinfow_tgetent" = xyes; then :
  LIBS="$LIBS -ltinfow"
fi


         if test "$cf_ncurses" = ncursesw; then
            for ac_header in ncursesw/ncurses.h ncursesw/panel.h
do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

done

         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
if ${ac_cv_lib_tinfo_tgetent+:} false; then :
  $as_echo_n "(cached) " >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinfo  $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 tgetent ();
int
main ()
{
return tgetent ();
  ;
  return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
  ac_cv_lib_tinfo_tgetent=yes
else
  ac_cv_lib_tinfo_tgetent=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_tinfo_tgetent" >&5
$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :
  LIBS="$LIBS -ltinfo"
fi

             for ac_header in ncurses/ncurses.h ncurses/panel.h
do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

Return to bug 699972

Line Link Here

(-)file_not_specified_in_diff (-15 / +56 lines)
0	-- a/configure.ac	0	++ b/configure.ac
Lines 100-112 AC_CHECK_FUNC(initscr,, Link Here
100	AC_CHECK_LIB($cf_ncurses, initscr,	100	AC_CHECK_LIB($cf_ncurses, initscr,
101	[LIBS="$LIBS -l$cf_ncurses"	101	[LIBS="$LIBS -l$cf_ncurses"
102		102
103	AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
104		103
105	if test "$cf_ncurses" = ncursesw; then	104	if test "$cf_ncurses" = ncursesw; then
		105	AC_CHECK_LIB(tinfow, tgetent, [LIBS="$LIBS -ltinfow"])
106	AC_CHECK_HEADERS([ncursesw/ncurses.h ncursesw/panel.h],,	106	AC_CHECK_HEADERS([ncursesw/ncurses.h ncursesw/panel.h],,
107	[AC_CHECK_HEADERS([ncurses.h panel.h],,	107	[AC_CHECK_HEADERS([ncurses.h panel.h],,
108	AC_MSG_ERROR([Missing header file]))])	108	AC_MSG_ERROR([Missing header file]))])
109	else	109	else
		110	AC_CHECK_LIB(tinfo, tgetent, [LIBS="$LIBS -ltinfo"])
110	AC_CHECK_HEADERS([ncurses/ncurses.h ncurses/panel.h],,	111	AC_CHECK_HEADERS([ncurses/ncurses.h ncurses/panel.h],,
111	[AC_CHECK_HEADERS([ncurses.h panel.h],,	112	[AC_CHECK_HEADERS([ncurses.h panel.h],,
112	AC_MSG_ERROR([Missing header file]))])	113	AC_MSG_ERROR([Missing header file]))])
113	-- a/configure	114	++ b/configure
Lines 14148-14160 $as_echo "$ac_res" >&6; } Link Here
14148	if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :	14148	if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
14149	LIBS="$LIBS -l$cf_ncurses"	14149	LIBS="$LIBS -l$cf_ncurses"
14150		14150
14151	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5	14151
14152	$as_echo_n "checking for tgetent in -ltinfo... " >&6; }	14152	if test "$cf_ncurses" = ncursesw; then
14153	if ${ac_cv_lib_tinfo_tgetent+:} false; then :	14153	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfow" >&5
		14154	$as_echo_n "checking for tgetent in -ltinfow... " >&6; }
		14155	if ${ac_cv_lib_tinfow_tgetent+:} false; then :
14154	$as_echo_n "(cached) " >&6	14156	$as_echo_n "(cached) " >&6
14155	else	14157	else
14156	ac_check_lib_save_LIBS=$LIBS	14158	ac_check_lib_save_LIBS=$LIBS
14157	LIBS="-ltinfo $LIBS"	14159	LIBS="-ltinfow $LIBS"
14158	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	14160	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14159	/* end confdefs.h. */	14161	/* end confdefs.h. */
14160		14162
Lines 14174-14195 return tgetent (); Link Here
14174	}	14176	}
14175	_ACEOF	14177	_ACEOF
14176	if ac_fn_c_try_link "$LINENO"; then :	14178	if ac_fn_c_try_link "$LINENO"; then :
14177	ac_cv_lib_tinfo_tgetent=yes	14179	ac_cv_lib_tinfow_tgetent=yes
14178	else	14180	else
14179	ac_cv_lib_tinfo_tgetent=no	14181	ac_cv_lib_tinfow_tgetent=no
14180	fi	14182	fi
14181	rm -f core conftest.err conftest.$ac_objext \	14183	rm -f core conftest.err conftest.$ac_objext \
14182	conftest$ac_exeext conftest.$ac_ext	14184	conftest$ac_exeext conftest.$ac_ext
14183	LIBS=$ac_check_lib_save_LIBS	14185	LIBS=$ac_check_lib_save_LIBS
14184	fi	14186	fi
14185	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5	14187	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_tgetent" >&5
14186	$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }	14188	$as_echo "$ac_cv_lib_tinfow_tgetent" >&6; }
14187	if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :	14189	if test "x$ac_cv_lib_tinfow_tgetent" = xyes; then :
14188	LIBS="$LIBS -ltinfo"	14190	LIBS="$LIBS -ltinfow"
14189	fi	14191	fi
14190		14192
14191
14192	if test "$cf_ncurses" = ncursesw; then
14193	for ac_header in ncursesw/ncurses.h ncursesw/panel.h	14193	for ac_header in ncursesw/ncurses.h ncursesw/panel.h
14194	do :	14194	do :
14195	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	14195	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
Lines 14220-14225 fi Link Here
14220	done	14220	done
14221		14221
14222	else	14222	else
		14223	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
		14224	$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
		14225	if ${ac_cv_lib_tinfo_tgetent+:} false; then :
		14226	$as_echo_n "(cached) " >&6
		14227	else
		14228	ac_check_lib_save_LIBS=$LIBS
		14229	LIBS="-ltinfo $LIBS"
		14230	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		14231	/* end confdefs.h. */
		14232
		14233	/* Override any GCC internal prototype to avoid an error.
		14234	Use char because int might match the return type of a GCC
		14235	builtin and then its argument prototype would still apply. */
		14236	#ifdef __cplusplus
		14237	extern "C"
		14238	#endif
		14239	char tgetent ();
		14240	int
		14241	main ()
		14242	{
		14243	return tgetent ();
		14244	;
		14245	return 0;
		14246	}
		14247	_ACEOF
		14248	if ac_fn_c_try_link "$LINENO"; then :
		14249	ac_cv_lib_tinfo_tgetent=yes
		14250	else
		14251	ac_cv_lib_tinfo_tgetent=no
		14252	fi
		14253	rm -f core conftest.err conftest.$ac_objext \
		14254	conftest$ac_exeext conftest.$ac_ext
		14255	LIBS=$ac_check_lib_save_LIBS
		14256	fi
		14257	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
		14258	$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
		14259	if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then :
		14260	LIBS="$LIBS -ltinfo"
		14261	fi
		14262
14223	for ac_header in ncurses/ncurses.h ncurses/panel.h	14263	for ac_header in ncurses/ncurses.h ncurses/panel.h
14224	do :	14264	do :
14225	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	14265	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`