conf: always build ibus-memconf for testing

BUG=none

Review URL: https://codereview.appspot.com/6457087

diff --git a/conf/Makefile.am b/conf/Makefile.am
index 86127b2f8a56adc918f4ba4e76172811e1c86bb4..54c73b7b8c382cfe4f49090df1a449d216c093d2 100644 (file)
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -26,11 +26,9 @@ GCONF_DIR = \
        $(NULL)
 endif
 
-if ENABLE_MEMCONF
 MEMCONF_DIR = \
        memconf \
        $(NULL)
-endif
 
 if ENABLE_DCONF
 DCONF_DIR = \

diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am
index f5f5c082a220c00cf6961cb9147f620355b49644..5837e66170c7abdd57a91e1e7056eb6f44e3b451 100644 (file)
--- a/conf/memconf/Makefile.am
+++ b/conf/memconf/Makefile.am
@@ -22,10 +22,16 @@
 
 libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
 
-libexec_PROGRAMS = \
+memconf_programs = \
        ibus-memconf \
        $(NULL)
 
+if ENABLE_MEMCONF
+libexec_PROGRAMS = $(memconf_programs)
+else
+noinst_PROGRAMS = $(memconf_programs)
+endif
+
 ibus_memconf_SOURCES = \
        main.c \
        config.c \
@@ -48,11 +54,13 @@ ibus_memconf_DEPENDENCIES = \
        $(libibus) \
        $(NULL)
 
+if ENABLE_MEMCONF
 component_DATA = \
        memconf.xml \
        $(NULL)
 
 componentdir = $(pkgdatadir)/component
+endif
 
 CLEANFILES = \
        memconf.xml \