Wed Jan 7 15:08:24 2004 Michael Jennings (mej)

Disable build-time check for screen.


SVN revision: 8297

3 files changed, 22 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 1be23a2..b69b73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5156,3 +5156,7 @@ Mon Dec 22 15:56:51 2003                        Michael Jennings (mej)
 
 Backported changes to menu generation.
 ----------------------------------------------------------------------
+Wed Jan  7 15:08:24 2004                        Michael Jennings (mej)
+
+Disable build-time check for screen.
+----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index b559aa7..b52d780 100644
--- a/configure.in
+++ b/configure.in
@@ -364,17 +364,19 @@ AC_ARG_WITH(pablo,
 )
 AC_MSG_CHECKING(for Escreen support)
 AC_ARG_ENABLE(escreen,
-[  --enable-escreen        enable Eterm's built-in screen support], [
-            if test "$enableval" = "yes"; then 
-              AC_CHECK_PROG(FOUND_SCREEN, screen, screen)
-              if test ! -z "$FOUND_SCREEN"; then
-                AC_DEFINE(NS_HAVE_SCREEN,1,[Support the GNU screen text windowing system?])
-              else
-                AC_WARN(*** screen support has been disabled because screen was not found ***)
-              fi
+[  --disable-escreen       disable Eterm's built-in screen support], [
+            if test "$enableval" = "yes"; then
+              FOUND_SCREEN=1
+              AC_DEFINE(NS_HAVE_SCREEN,1,[Support the GNU screen text windowing system?])
+              AC_MSG_RESULT(yes)
             else
               AC_MSG_RESULT(no)
-            fi], AC_MSG_RESULT(no)
+            fi
+          ], [
+            FOUND_SCREEN=1
+            AC_DEFINE(NS_HAVE_SCREEN,1,[Support the GNU screen text windowing system?])
+            AC_MSG_RESULT(yes)
+          ]
 )
 AC_MSG_CHECKING(for Etwin support)
 AC_ARG_ENABLE(etwin,
diff --git a/src/command.c b/src/command.c
index 3a15f68..5d691a0 100644
--- a/src/command.c
+++ b/src/command.c
@@ -2916,6 +2916,7 @@ escreen_init(char **argv)
     int ns_err;
     _ns_efuns *efuns;
     buttonbar_t *bbar;
+    spif_uchar_t old_pause = (BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_PAUSE) ? (1) : (0));
 
     if (TermWin.screen_mode == NS_MODE_NONE) {
         return run_command(argv);
@@ -2939,6 +2940,7 @@ escreen_init(char **argv)
         bbar_add(bbar);
     }
 
+    BITFIELD_SET(eterm_options, ETERM_OPTIONS_PAUSE);
     if ((TermWin.screen = ns_attach_by_URL(rs_url, rs_hop, &efuns, &ns_err, bbar)) == NULL) {
         D_CMD(("ns_attach_by_URL(%s,%s) failed\n", rs_url, rs_hop));
         return -1;
@@ -2946,6 +2948,9 @@ escreen_init(char **argv)
     if (rs_delay >= 0) {
         TermWin.screen->delay = rs_delay;       /* more flexible ways later */
     }
+    if (!old_pause) {
+        BITFIELD_CLEAR(eterm_options, ETERM_OPTIONS_PAUSE);
+    }
 
     make_escreen_menu(bbar);
 
@@ -3002,7 +3007,8 @@ init_command(char **argv)
     }
     if ((cmd_fd = command_func(argv)) < 0) {
         print_error("Unable to run sub-command.\n");
-        exit(EXIT_FAILURE);
+        paused = 1;
+        rs_finished_text = "Hit a key to exit...";
     }
 }