diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-01-31 22:22:05 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-01-31 22:22:05 +0000 |
commit | c8dd927e0c6dd23f065c965f08e4921ed2635fda (patch) | |
tree | 2c4b99a172f89f5f443d783e7e2cd448eec1019d /plugins | |
parent | 42bf48fa74032b40af0c750daf9e0daca6c23d68 (diff) |
It was hard.. but at the end I won (or at least i believe so...).
After install hello_world.lua works.
svn path=/trunk/; revision=17137
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/lua/Makefile.am | 26 |
2 files changed, 18 insertions, 16 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 5ba7ff100a..7e36571163 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -21,6 +21,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +if HAVE_LIBLUA +lua_dir = \ + lua +else # HAVE_LIBLUA +lua_dir = +endif # HAVE_LIBLUA + SUBDIRS = \ acn \ agentx \ @@ -33,6 +40,7 @@ SUBDIRS = \ gryphon \ h223 \ irda \ + $(lua_dir) \ lwres \ mate \ megaco \ diff --git a/plugins/lua/Makefile.am b/plugins/lua/Makefile.am index 65e050f3bd..1e3bde5c4a 100644 --- a/plugins/lua/Makefile.am +++ b/plugins/lua/Makefile.am @@ -21,30 +21,30 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -INCLUDES = -I$(top_srcdir) -I./lua-5.0.2/include +INCLUDES = -I$(top_srcdir) plugindir = @plugindir@ plugin_LTLIBRARIES = lua.la lua_la_SOURCES = \ - lua_tvb.c \ - lua_proto.c \ - lua_tree.c \ - lua_pinfo.c \ - lua_tap.c \ - packet-lua.c \ - packet-lua.h \ + lua_tvb.c \ + lua_proto.c \ + lua_tree.c \ + lua_pinfo.c \ + lua_tap.c \ + packet-lua.c \ + packet-lua.h \ plugin.c lua_la_LDFLAGS = -module -avoid-version -lua_la_LIBADD = @PLUGIN_LIBS@ +lua_la_LIBADD = @PLUGIN_LIBS@ @LUA_LIBS@ # Libs must be cleared, or else libtool won't create a shared module. # If your module needs to be linked against any particular libraries, # add them here. -LIBS = -L./lua-5.0.2/lib -llua -llualib +LIBS = CLEANFILES = \ @@ -62,9 +62,3 @@ EXTRA_DIST = \ dummy: touch dummy -GUNZIP = gzip -d -TAR = tar - -lua-5.0.2: lua-5.0.2.tar.gz - $(GUNZIP) lua-5.0.2.tar.gz | $(TAR) xf - - |