Disable lua extension by default

diff --git a/Makefile.am b/Makefile.am
index 4bd3522..01773d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+if IBUS_BUILD_LUA_EXTENSION
+LUADIR=lua
+endif
+
 SUBDIRS = \
        data \
-       lua \
+       $(LUADIR) \
        src \
        setup \
        m4 \

diff --git a/configure.ac b/configure.ac
index fb3aa09..76ec04a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,17 +152,12 @@ AC_ARG_ENABLE(db-open-phrase,
 )
 AM_CONDITIONAL(IBUS_BUILD_DB_OPEN_PHRASE, [test x"$enable_db_open_phrase" = x"yes" ])
 
-# --disable-lua-extension
+# --enable-lua-extension
 AC_ARG_ENABLE(lua-extension,
-    AS_HELP_STRING([--disable-lua-extension],
+    AS_HELP_STRING([--enable-lua-extension],
          [build lua extension]),
-    [   if test "$enableval" = yes; then
-            enable_lua_extension = no
-        else
-            enable_lua_extension = yes
-        fi
-    ],
-    [enable_lua_extension=yes]
+    [enable_lua_extension=$enableval],
+    [enable_lua_extension=no]
 )
 
 # check lua

diff --git a/lua/Makefile.am b/lua/Makefile.am
index c1ef9c4..e38c14c 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -18,18 +18,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-if IBUS_BUILD_LUA_EXTENSION
 lua_script_DATA = base.lua \
         $(NULL)
-endif
 
 lua_scriptdir = $(pkgdatadir)
 
-if IBUS_BUILD_LUA_EXTENSION
 noinst_LTLIBRARIES = \
        libpylua.la \
        $(NULL)
-endif
 
 libpylua_la_SOURCES = \
        lua-plugin.h \
@@ -48,12 +44,10 @@ libpylua_la_LIBADD = \
        @LUA_LIBS@ \
        $(NULL)
 
-if IBUS_BUILD_LUA_EXTENSION
 TESTS = \
     lua-ext-console \
        test-lua-plugin \
        $(NULL)
-endif
 
 noinst_PROGRAMS = \
        $(TESTS) \