121 lines
3 KiB
Text
121 lines
3 KiB
Text
--- configure.orig Fri Dec 5 15:46:53 2003
|
|
+++ configure Sat Mar 4 10:18:24 2006
|
|
@@ -4746,48 +4746,6 @@
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
olibs="$LIBS"
|
|
-LIBS="-lcurses $olibs"
|
|
-{ echo "$as_me:$LINENO: checking libcurses..." >&5
|
|
-echo "$as_me: checking libcurses..." >&6;}
|
|
-cat >conftest.$ac_ext <<_ACEOF
|
|
-#line $LINENO "configure"
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
-#ifdef __hpux
|
|
-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
|
|
-#else
|
|
-tgetent((char *)0, (char *)0);
|
|
-#endif
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
- (eval $ac_link) 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } &&
|
|
- { ac_try='test -s conftest$ac_exeext'
|
|
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
- (eval $ac_try) 2>&5
|
|
- ac_status=$?
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- :
|
|
-else
|
|
- echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
LIBS="-ltermcap $olibs"
|
|
{ echo "$as_me:$LINENO: checking libtermcap..." >&5
|
|
echo "$as_me: checking libtermcap..." >&6;}
|
|
@@ -4907,8 +4865,6 @@
|
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
|
|
if test "$cross_compiling" = yes; then
|
|
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
|
@@ -4927,7 +4883,8 @@
|
|
|
|
main()
|
|
{
|
|
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
|
|
+ char *tgoto(const char *, int, int);
|
|
+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
|
|
}
|
|
_ACEOF
|
|
rm -f conftest$ac_exeext
|
|
@@ -5314,19 +5271,16 @@
|
|
fi
|
|
rm -f conftest*
|
|
|
|
-if test "$ptys" != "$pdir/pty??" ; then
|
|
-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
|
|
-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
|
|
+# XXX: hardcoded, since port must be devfs and various setups independent
|
|
+
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define PTYRANGE0 "$p0"
|
|
+#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
|
|
_ACEOF
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define PTYRANGE1 "$p1"
|
|
+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
|
|
_ACEOF
|
|
|
|
-fi
|
|
-
|
|
|
|
# Check whether --with-pty-mode or --without-pty-mode was given.
|
|
if test "${with_pty_mode+set}" = set; then
|
|
@@ -5575,6 +5529,8 @@
|
|
#if defined(SVR4) && !defined(DGUX)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
#else
|
|
#include <utmp.h>
|
|
#endif
|
|
@@ -5627,6 +5583,8 @@
|
|
#if defined(SVR4) && !defined(DGUX)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
#else
|
|
#include <utmp.h>
|
|
#endif
|
|
@@ -5683,6 +5641,8 @@
|
|
#if defined(SVR4) && !defined(DGUX)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
#else
|
|
#include <utmp.h>
|
|
#endif
|