Ticket #4032: 0001-Revert-Ticket-4031-add-option-to-control-configure-a.patch

File 0001-Revert-Ticket-4031-add-option-to-control-configure-a.patch, 2.9 KB (added by jpew, 4 years ago)

Revert #4031

  • configure.ac 

    From a125473504ec7ba6577f31ae863067dbc385d5a8 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Mon, 11 Nov 2019 13:59:38 -0600
Subject: [PATCH 1/3] Revert "Ticket #4031: add option to control configure
 args."

This reverts commit d009ea7b8b09e0acf33663738a023ee0df5fe4d0.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 configure.ac   | 8 +-------
 src/args.c     | 6 ------
 src/textconf.c | 2 --
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34c67a6ef..6abe53100 100644
    a b dnl Clarify do we really need GModule 
    546546AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ 
    547547                                test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) 
    548548 
    549 AC_ARG_ENABLE([configure-args], 
    550     AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors])) 
    551 if test "x$enable_configure_args" != xno; then 
    552     AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help]) 
    553     AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) 
    554 fi 
    555  
     549AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) 
    556550 
    557551AC_CONFIG_FILES( 
    558552[ 

  • src/args.c 

    diff --git a/src/args.c b/src/args.c
index f8dc24020..baef1a1c8 100644
    a b static gboolean mc_args__nouse_subshell = FALSE; 
    9595#endif /* ENABLE_SUBSHELL */ 
    9696static gboolean mc_args__show_datadirs = FALSE; 
    9797static gboolean mc_args__show_datadirs_extended = FALSE; 
    98 #ifdef ENABLE_CONFIGURE_ARGS 
    9998static gboolean mc_args__show_configure_opts = FALSE; 
    100 #endif 
    10199 
    102100static GOptionGroup *main_group; 
    103101 
    … … static const GOptionEntry argument_main_table[] = { 
    127125     NULL 
    128126    }, 
    129127 
    130 #ifdef ENABLE_CONFIGURE_ARGS 
    131128    /* show configure options */ 
    132129    { 
    133130     "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, 
    … … static const GOptionEntry argument_main_table[] = { 
    135132     N_("Print configure options"), 
    136133     NULL 
    137134    }, 
    138 #endif 
    139135 
    140136    { 
    141137     "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, 
    … … mc_args_show_info (void) 
    762758        return FALSE; 
    763759    } 
    764760 
    765 #ifdef ENABLE_CONFIGURE_ARGS 
    766761    if (mc_args__show_configure_opts) 
    767762    { 
    768763        show_configure_options (); 
    769764        return FALSE; 
    770765    } 
    771 #endif 
    772766 
    773767    return TRUE; 
    774768} 

  • src/textconf.c 

    diff --git a/src/textconf.c b/src/textconf.c
index f39b9e028..1e0613e58 100644
    a b show_datadirs_extended (void) 
    232232 
    233233/* --------------------------------------------------------------------------------------------- */ 
    234234 
    235 #ifdef ENABLE_CONFIGURE_ARGS 
    236235void 
    237236show_configure_options (void) 
    238237{ 
    239238    (void) printf ("%s\n", MC_CONFIGURE_ARGS); 
    240239} 
    241 #endif 
    242240 
    243241/* --------------------------------------------------------------------------------------------- */