bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'emonty/master'

This commit is contained in:
Doug MacEachern 2009-08-23 16:13:14 -07:00
parent 7dca6c58cc 4608cde968
commit 499c7c8b0b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bindings/lua/Makefile.am
View File

@ -1,8 +1,12 @@
INCLUDES=@INCLUDES@ INCLUDES=@INCLUDES@
lib_LTLIBRARIES = sigar.la lib_LTLIBRARIES=
TESTS=
sigar_la_SOURCES =\ if BUILD_LUA
lib_LTLIBRARIES += sigar.la
sigar_la_SOURCES =\
sigar.c \ sigar.c \
sigar-cpu.c \ sigar-cpu.c \
sigar-disk.c \ sigar-disk.c \
@ -19,6 +23,11 @@ sigar_la_CPPFLAGS = ${LUA_CFLAGS}
sigar_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version sigar_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
sigar_la_LIBADD = $(top_builddir)/src/libsigar.la sigar_la_LIBADD = $(top_builddir)/src/libsigar.la
TESTS += \
sigar-test.lua
endif
noinst_HEADERS = lua-sigar.h noinst_HEADERS = lua-sigar.h
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
@ -27,5 +36,3 @@ TESTS_ENVIRONMENT = \
DYLD_LIBRARY_PATH="${top_builddir}/src/.libs/" \ DYLD_LIBRARY_PATH="${top_builddir}/src/.libs/" \
lua lua
TESTS = \
sigar-test.lua

4
configure.ac
View File

@ -129,13 +129,15 @@ if test "$WITH_LUA" != "no"; then
PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
AC_DEFINE([HAVE_LUA], [1], [liblua]) AC_DEFINE([HAVE_LUA], [1], [liblua])
AC_DEFINE([HAVE_LUA_H], [1], [lua.h]) AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
]) ],[WITH_LUA=no])
]) ])
AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS) AC_SUBST(LUA_LIBS)
fi fi
AM_CONDITIONAL([BUILD_LUA],[test "$WITH_LUA" != "no"])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
include/Makefile include/Makefile