source: pkg/raul/main/vte/trunk/debian/patches/25_optional-ncurses.patch @ 7371

configure.in

@@ -336 +336 @@
 AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
 AC_CHECK_FUNCS([ceil floor])
 
-# Look for tgetent
+AC_ARG_WITH(ncurses,
+           [AS_HELP_STRING([--without-ncurses],
+                           [don't use ncurses library])
+           ], with_ncurses=$withval, with_ncurses=yes)
 
-AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
-  [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
-    [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
-      [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
-        [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
-          [vte_cv_termcap_lib=])])])])])
-
-case "$vte_cv_termcap_lib" in
-  libc)       # FIXME: which headers to include here?
-              ;;
-  libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h
-              AC_CHECK_HEADERS([ncurses.h term.h],[],
-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
-                  [AC_MSG_ERROR([ncurses headers not found])])])
-              LIBS="-lncurses $LIBS"
-              ;;
-  libtinfo)   # Need ncurses/curses.h and ncurses/term.h
-              AC_CHECK_HEADERS([ncurses.h term.h],[],
-                [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
-                  [AC_MSG_ERROR([ncurses headers not found])])])
-              LIBS="-ltinfo $LIBS"
-              ;;
-  libcurses)  # Need curses.h and term.h
-              AC_CHECK_HEADERS([curses.h term.h],[],
-                [AC_MSG_ERROR([curses headers not found])],
-                [[#ifdef HAVE_CURSES_H
-                  #include <curses.h>
-                  #endif]])
-              LIBS="-lcurses $LIBS"
-              ;;
-  libtermcap) # Need termcap.h
-              AC_CHECK_HEADERS([termcap.h],[],
-                [AC_MSG_ERROR([termcap headers not found])])
-              LIBS="-ltermcap $LIBS"
-              ;;
-  *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
-esac
+if test x$with_ncurses = xyes ; then
+        # Look for tgetent
+
+        AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
+          [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
+            [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
+              [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
+                [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
+                  [vte_cv_termcap_lib=])])])])])
+
+        case "$vte_cv_termcap_lib" in
+          libc)       # FIXME: which headers to include here?
+                      ;;
+          libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h
+                      AC_CHECK_HEADERS([ncurses.h term.h],[],
+                        [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+                          [AC_MSG_ERROR([ncurses headers not found])])])
+                      LIBS="-lncurses $LIBS"
+                      ;;
+          libtinfo)   # Need ncurses/curses.h and ncurses/term.h
+                      AC_CHECK_HEADERS([ncurses.h term.h],[],
+                        [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+                          [AC_MSG_ERROR([ncurses headers not found])])])
+                      LIBS="-ltinfo $LIBS"
+                      ;;
+          libcurses)  # Need curses.h and term.h
+                      AC_CHECK_HEADERS([curses.h term.h],[],
+                        [AC_MSG_ERROR([curses headers not found])],
+                        [[#ifdef HAVE_CURSES_H
+                          #include <curses.h>
+                          #endif]])
+                      LIBS="-lcurses $LIBS"
+                      ;;
+          libtermcap) # Need termcap.h
+                      AC_CHECK_HEADERS([termcap.h],[],
+                        [AC_MSG_ERROR([termcap headers not found])])
+                      LIBS="-ltermcap $LIBS"
+                      ;;
+          *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
+        esac
+fi
 
 # Search for the required modules.
 

src/keymap.c

@@ -44 +44 @@
 #include <termcap.h>
 #define VTE_TERMCAP_NAME "termcap"
 #else
-#error No termcap??
+#undef VTE_TERMCAP_NAME
 #endif
 
 #ifdef VTE_DEBUG
@@ -1008 +1008 @@
         enum _vte_fkey_mode fkey_mode;
         char *cap, *tmp;
         const char *termcap_special = NULL;
+#ifdef VTE_TERMCAP_NAME
         char ncurses_buffer[4096];
         char ncurses_area[512];
+#endif
 
         g_return_if_fail(normal != NULL);
         g_return_if_fail(normal_length != NULL);
@@ -1163 +1165 @@
                         }
                 }
         }
+#ifdef VTE_TERMCAP_NAME
         if (termcap_special != NULL) {
                 tmp = g_strdup(terminal);
                 cap = NULL;
@@ -1203 +1206 @@
                         return;
                 }
         }
+#endif
 
         _vte_debug_print(VTE_DEBUG_KEYBOARD,
                         " (ignoring, no match for modifier state).\n");

src/ssfe.c

@@ -38 +38 @@
 #include <termcap.h>
 #define VTE_TERMCAP_NAME "termcap"
 #else
-#error No termcap??
+#undef VTE_TERMCAP_NAME
 #endif
 
 #include <sys/types.h>