From: ellson Date: Tue, 18 Oct 2005 21:11:56 +0000 (+0000) Subject: some prepations for lua support for when swig-1.3.26 arrives X-Git-Tag: LAST_LIBGRAPH~32^2~7053 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d7013d85c19d0c48b494a8ab2f8e0b6264ff6ca;p=graphviz some prepations for lua support for when swig-1.3.26 arrives --- diff --git a/configure.ac b/configure.ac index 33f05467f..ab592da3b 100644 --- a/configure.ac +++ b/configure.ac @@ -375,6 +375,22 @@ fi fi AM_CONDITIONAL(WITH_JAVA, [test "x$JAVA" != "x"]) +dnl ----------------------------------- +dnl INCLUDES and LIBS for LUA + +if test "x$SWIG" != "x"; then +AC_ARG_ENABLE(lua, + [AC_HELP_STRING([--disable-lua], [don't support lua language bindings])]) +if test "x$enable_lua" != "xno"; then +AC_CHECK_PROG(LUA,lua,lua) +IO_INCLUDES= +IO_LIBS= +AC_SUBST(IO_INCLUDES) +AC_SUBST(IO_LIBS) +fi +fi +AM_CONDITIONAL(WITH_LUA, [test "x$LUA" != "x"]) + dnl ----------------------------------- dnl INCLUDES and LIBS for OCAML diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index 596607c95..1cd659fb4 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -46,6 +46,14 @@ libgv_java_la_LDFLAGS = -module gv_java.cpp $(JAVA_hdr): gv.i $(SWIG) -c++ -java -o gv_java.cpp gv.i +#pkgluadir = $(pkglibdir)/lua +#LUA_hdr = +#libgv_lua_la_SOURCES = $(BASESOURCES) gv_lua.cpp +#libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@ +#libgv_lua_la_LDFLAGS = -module +#gv_lua.cpp $(LUA_hdr): gv.i +# $(SWIG) -c++ -lua -o gv_lua.cpp gv.i + pkgocamldir = $(pkglibdir)/ocaml OCAML_hdr = gv.ml gv.mli libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_ocaml.cpp @@ -117,6 +125,11 @@ pkgjava_DATA = $(JAVA_hdr) pkgjava_LTLIBRARIES = libgv_java.la TESTS += test_java endif +#if WITH_LUA +#pkglua_DATA += $(LUA_hdr) +#pkglua_LTLIBRARIES += libgv_lua.la +#TESTS += test_lua +#endif if WITH_OCAML pkgocaml_DATA = $(OCAML_hdr) pkgocaml_LTLIBRARIES = libgv_ocaml.la @@ -186,6 +199,14 @@ test_java: libgv_java.la javac *.java; \ LD_LIBRARY_PATH=. CLASSPATH=. java test) +.PHONY: test_lua +test_lua: libgv_lua.la + -(mkdir -p test_lua; cd test_lua; \ + ln -fs ../.libs/libgv_lua.so libgv.so; \ + ln -fs ../*.dot ../*.lua .; \ + luac *.lua; \ + LD_LIBRARY_PATH=. lua test) + .PHONY: test_ocaml test_ocaml: libgv_ocaml.la -(mkdir -p test_ocaml; cd test_ocaml; \ @@ -240,6 +261,7 @@ EXTRA_DIST = demo/* gv.cpp gv.i \ gv_tcl.cpp $(TCL_hdr) # gv_io.cpp $(IO_hdr) \ +# gv_lua.cpp $(LUA_hdr) \ # CLEANFILES = test_*/* @@ -249,6 +271,7 @@ DISTCLEANFILES = \ gv_guile.cpp $(GUILE_hdr) \ gv_io.cpp $(IO_hdr) \ gv_java.cpp $(JAVA_hdr) \ + gv_lua.cpp $(LUA_hdr) \ gv_ocaml.cpp $(OCAML_hdr) \ gv_perl.cpp $(PERL_hdr) \ gv_php.cpp $(PHP_hdr) \