Browse Source

Fix lua plugin build

Serj Kalichev 9 years ago
parent
commit
152931b934
3 changed files with 13 additions and 12 deletions
  1. 1 1
      configure.ac
  2. 12 9
      plugins/lua/module.am
  3. 0 2
      plugins/module.am

+ 1 - 1
configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([MAJOR_VERSION], 2)
 m4_define([MINOR_VERSION], 0)
-m4_define([MICRO_VERSION], 1)
+m4_define([MICRO_VERSION], 2)
 
 AC_PREREQ(2.59)
 AC_INIT([klish],

+ 12 - 9
plugins/lua/module.am

@@ -1,16 +1,19 @@
-lib_LTLIBRARIES			+= clish_plugin_lua.la
-clish_plugin_lua_la_SOURCES	 = 
-clish_plugin_lua_la_LIBADD	 = @LUA_LIB@
-clish_plugin_lua_la_LDFLAGS	 = -avoid-version -module
+if WITH_LUA
+lib_LTLIBRARIES += clish_plugin_lua.la
+endif
+
+clish_plugin_lua_la_SOURCES =
+clish_plugin_lua_la_LIBADD = @LUA_LIB@
+clish_plugin_lua_la_LDFLAGS = -avoid-version -module
 if HAVE_LD_VERSION_SCRIPT
-clish_plugin_lua_la_LDFLAGS	+= -Wl,--version-script=plugins/lua/version.map
+clish_plugin_lua_la_LDFLAGS += -Wl,--version-script=plugins/lua/version.map
 else
-clish_plugin_lua_la_LDFLAGS     += -export-symbols plugins/lua/symbols.map
+clish_plugin_lua_la_LDFLAGS += -export-symbols plugins/lua/symbols.map
 endif
 
-clish_plugin_lua_la_CPPFLAGS	 = $(AM_CPPFLAGS) @LUA_INCLUDE@
+clish_plugin_lua_la_CPPFLAGS = $(AM_CPPFLAGS) @LUA_INCLUDE@
 
-clish_plugin_lua_la_LIBADD	+= \
+clish_plugin_lua_la_LIBADD += \
 	liblub.la \
 	libclish.la \
 	libkonf.la
@@ -20,7 +23,7 @@ clish_plugin_lua_la_DEPENDENCIES = \
 	libclish.la \
 	libkonf.la
 
-clish_plugin_lua_la_SOURCES	+= \
+clish_plugin_lua_la_SOURCES += \
 	plugins/lua/plugin_init.c \
 	plugins/lua/plugin_fini.c \
 	plugins/lua/lua_init.c \

+ 0 - 2
plugins/module.am

@@ -5,6 +5,4 @@ EXTRA_DIST += \
 	plugins/clish/module.am
 
 include $(top_srcdir)/plugins/clish/module.am
-if WITH_LUA
 include $(top_srcdir)/plugins/lua/module.am
-endif