cleanup: removed remainders of conio

bareos · Jul 3, 2019 · e0d3ef0 · e0d3ef0
1 parent bb5b0d3
commit e0d3ef0
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 20 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -468,7 +468,6 @@ IF(NOT openssl)
 ENDIF()
 
 set(largefile_support "" )
-set(got_conio "" )
 
 set(got_readline "${READLINE_FOUND}" )
 if ("${READLINE_FOUND}")
@@ -661,7 +660,6 @@ MESSAGE("   File Daemon User:             ${fd_user} ")
 MESSAGE("   File Daemon Group:            ${fd_group} ")
 MESSAGE(" ")
 MESSAGE("   Large file support:           ${largefile_support}")
-MESSAGE("   Bareos conio support:         ${got_conio} ${CONS_LIBS} ")
 MESSAGE("   readline support:             ${got_readline} ROOT_DIR:${Readline_ROOT_DIR} INCLUDE_DIR:${Readline_INCLUDE_DIR} LIBRARY:${Readline_LIBRARY}
  ")
 MESSAGE("   TCP Wrappers support:         ${WRAP_FOUND} ${WRAP_LIBRARIES} ${WRAP_INCLUDE_DIRS} ")

diff --git a/core/cmake/BareosSetVariableDefaults.cmake b/core/cmake/BareosSetVariableDefaults.cmake
@@ -369,11 +369,6 @@ IF(NOT DEFINED lockmgr)
    set(LOCKMGR 0)
 ENDIF()
 
-# disable-conio
-IF(NOT DEFINED disable-conio)
-   SET(disable-conio ON)
-ENDIF()
-
 # readline
 IF(NOT DEFINED readline)
    SET(readline ON)

diff --git a/core/debian/rules b/core/debian/rules
@@ -45,7 +45,6 @@ define CONFIGURE_COMMON
   -Dbsrdir=/var/lib/bareos \
   -Dlogdir=/var/log/bareos \
   -Dsubsysdir=/var/lock \
-  -Ddisable-conio=yes \
   -Dreadline=yes \
   -Dbatch-insert=yes \
   -Ddynamic-debian-package-list=yes\

diff --git a/core/manpages/bconsole.1 b/core/manpages/bconsole.1
@@ -33,9 +33,6 @@ Set debug level to \fInn\fP.
 .BI \-dt
 Print timestamp in debug output.
 .TP
-.B \-n
-No conio (for scripting).
-.TP
 .B \-s
 No signals (for debugging).
 .TP

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile
@@ -100,7 +100,6 @@ CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON \
   -Dlogdir=/var/log/bareos \
   -Dsubsys-dir=/var/lock \
   -Dpython=yes\
-  -Dconio=no \
   -Dreadline=yes\
   -Dreadline=${LOCALBASE} \
   -Dbatch-insert=yes\

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -767,7 +767,6 @@ cmake  .. \
 %if 0%{?python_plugins}
   -Dpython=yes \
 %endif
-  -Ddisable-conio=yes \
   -Dreadline=yes \
   -Dbatch-insert=yes \
   -Ddynamic-cats-backends=yes \

diff --git a/core/po/POTFILES.in b/core/po/POTFILES.in
@@ -388,7 +388,6 @@
 ./src/ndmp/ndmp9_xmt.c
 ./src/ndmp/ndmjob_main_util.c
 ./src/console/console_conf.c
-./src/console/conio.c
 ./src/console/console.c
 ./src/plugins/stored/python-sd.h
 ./src/plugins/dird/python-dir.h
@@ -624,7 +623,6 @@
 ./src/ndmp/scsiconst.h
 ./src/ndmp/smc_priv.h
 ./src/ndmp/ndmp2_enum_strs.h
-./src/console/conio.h
 ./src/console/console_conf.h
 ./src/console/func.h
 ./src/qt-tray-monitor/monitortab.h

diff --git a/core/po/fr.po b/core/po/fr.po
@@ -21273,7 +21273,6 @@ msgstr ""
 #~ "Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
 #~ "       -c <file>   set configuration file to file\n"
 #~ "       -dnn        set debug level to nn\n"
-#~ "       -n          no conio\n"
 #~ "       -s          no signals\n"
 #~ "       -t          test - read configuration and exit\n"
 #~ "       -?          print this message.\n"

diff --git a/core/src/include/config.h.in b/core/src/include/config.h.in
@@ -148,9 +148,6 @@
 /* Define to 1 if you have compressBound */
 #cmakedefine HAVE_COMPRESS_BOUND @HAVE_COMPRESS_BOUND@
 
-/* Define to 1 if Bareos conio support enabled */
-#cmakedefine HAVE_CONIO @HAVE_CONIO@
-
 /* Define to 1 if cplus_demangle exists in libdemangle */
 #cmakedefine HAVE_CPLUS_DEMANGLE @HAVE_CPLUS_DEMANGLE@
 

diff --git a/regress/scripts/regress-config.in b/regress/scripts/regress-config.in
@@ -50,7 +50,6 @@ else
     -Dsubsys-dir=${1}/working \
     -Dplugindir=${1}/bin/plugins \
     -Dlockmgr=yes \
-    -Dconio=no \
     -Dworkingdir=${1}/working \
     -Darchivedir=${1}/tmp \
     -Ddump_email=${EMAIL} \