Ticket #2995: 0001-Check-if-GModule-is-required-and-do-not-link-it-in-if-not.patch

File 0001-Check-if-GModule-is-required-and-do-not-link-it-in-if-not.patch, 1.7 KB (added by er13, 11 years ago)

  • configure.ac 

    From 5d48c7c4ac5e158e89610d9f57008b20a1757d4f Mon Sep 17 00:00:00 2001
From: Eugene Rudoy <gene.devel@gmail.com>
Date: Sat, 6 Apr 2013 18:09:13 +0200
Subject: [PATCH] Check if GModule is required and do not link it in if not
 (saves space on embedded systems)

---
 configure.ac        | 3 +++
 lib/Makefile.am     | 2 +-
 lib/tty/Makefile.am | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2c35d06..ae6652d 100644
    a b AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"]) 
    495495AM_CONDITIONAL(CHARSET, [test -n "$have_charset"]) 
    496496AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"]) 
    497497 
     498# check if GModule is required and do not link it in if not (saves space on embedded systems) 
     499AM_CONDITIONAL(HAVE_GMODULE_AND_GMODULE_REQUIRED, [test x"$g_module_supported" != x -a x"$enable_aspell" = xyes -a x"$textmode_x11_support" = xyes]) 
     500 
    498501AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) 
    499502 
    500503AC_CONFIG_FILES( 

  • lib/Makefile.am 

    diff --git a/lib/Makefile.am b/lib/Makefile.am
index 18bf836..26442aa 100644
    a b libmc_la_LIBADD = \ 
    6565 
    6666libmc_la_LIBADD += $(MCLIBS) $(SLANGLIB) 
    6767 
    68 if HAVE_GMODULE 
     68if HAVE_GMODULE_AND_GMODULE_REQUIRED 
    6969    libmc_la_LIBADD += $(GMODULE_LIBS) 
    7070else 
    7171    libmc_la_LIBADD += $(GLIB_LIBS) 

  • lib/tty/Makefile.am 

    diff --git a/lib/tty/Makefile.am b/lib/tty/Makefile.am
index 30ba305..cb5e898 100644
    a b libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC) 
    2727 
    2828AM_CPPFLAGS = -I$(top_srcdir) 
    2929 
    30 if HAVE_GMODULE 
     30if HAVE_GMODULE_AND_GMODULE_REQUIRED 
    3131AM_CPPFLAGS += $(GMODULE_CFLAGS) 
    3232else 
    3333AM_CPPFLAGS += $(GLIB_CFLAGS)