diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2025-04-04 23:35:17 +0200 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-04-04 23:38:50 +0200 |
| commit | db6b9e8baece3fee719c69f61fbc94869c74f575 (patch) | |
| tree | 1ecf7e3dc6f8b2c565b13a0241148a06d9c04b11 | |
| parent | 65f505ea28f29738e4d874f55d96d6e2579ba757 (diff) | |
| download | manaplus-commandlinepassword_cleanup.tar.gz manaplus-commandlinepassword_cleanup.tar.bz2 manaplus-commandlinepassword_cleanup.tar.xz manaplus-commandlinepassword_cleanup.zip | |
Remove remnants of unused --enable-commandlinepassword configure option.commandlinepassword_cleanup
Addendum to 437258c4 / "Remove -enablecommandlinepassword necessity"
| -rwxr-xr-x | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/ci/branches/ci_main1/.gitlab-ci.yml | 28 |
3 files changed, 0 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac index dc041d8c9..c0539e221 100755 --- a/configure.ac +++ b/configure.ac @@ -149,18 +149,6 @@ esac],[openglerrors_enabled=false]) AM_CONDITIONAL(ENABLE_OPENGLERRORS, test "x$openglerrors_enabled" = xtrue) -# Enable password from command line -AC_ARG_ENABLE(commandlinepassword, -[ --enable-commandlinepassword Enable command line option for set password], -[case "${enableval}" in - yes) commandlinepassword_enabled=true - ;; - no) commandlinepassword_enabled=false - ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-commandlinepassword) ;; -esac],[commandlinepassword_enabled=false]) - -AM_CONDITIONAL(ENABLE_COMMANDLINEPASSWORD, test "x$commandlinepassword_enabled" = xtrue) # Checks for android. AC_ARG_ENABLE(androidbuild, diff --git a/src/Makefile.am b/src/Makefile.am index 394a7bd45..418503b78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,10 +69,6 @@ manaplus_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG= dyecmd_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0 endif -if ENABLE_COMMANDLINEPASSWORD -manaplus_CXXFLAGS += -DENABLE_COMMANDLINEPASSWORD -endif - if USE_X11 manaplus_CXXFLAGS += -DUSE_X11 dyecmd_CXXFLAGS += -DUSE_X11 diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index 27ecc3655..021934447 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -253,31 +253,3 @@ gcc-8_unsigned_char_sdl2: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev git gdb valgrind netcat-openbsd procps POST_CXXFLAGS: "-funsigned-char" - -gcc-8_password: - stage: build - script: - - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - PACKAGES: gcc-8 g++-8 - make autoconf automake autopoint gettext - libxml2-dev libcurl4-gnutls-dev libpng-dev - libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev - git gdb valgrind netcat-openbsd procps - -gcc-8_password_sdl2: - stage: build - script: - - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword --with-sdl2 - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - ABOUTYOFFSET: 380 - PACKAGES: gcc-8 g++-8 - make autoconf automake autopoint gettext - libxml2-dev libcurl4-gnutls-dev libpng-dev - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - git gdb valgrind netcat-openbsd procps |