diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-02-27 13:21:09 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-11 17:48:02 +0300 |
| commit | d24c848ed6ebd0ef05b2c735c62d5b3b18b6a5d9 (patch) | |
| tree | 12c4dde2822ef48399256d64c4b681ddd4515aa3 | |
| parent | cdc5b750c2d50686e8f8fc1b235cbd07d95a267b (diff) | |
| download | librpm-tizen-d24c848ed6ebd0ef05b2c735c62d5b3b18b6a5d9.tar.gz librpm-tizen-d24c848ed6ebd0ef05b2c735c62d5b3b18b6a5d9.tar.bz2 librpm-tizen-d24c848ed6ebd0ef05b2c735c62d5b3b18b6a5d9.zip | |
Enable lua
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | packaging/librpm-tizen.spec | 7 |
4 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8e902f191..89c54e405 100644 --- a/configure.ac +++ b/configure.ac @@ -793,9 +793,12 @@ AC_ARG_WITH([lua], [AS_HELP_STRING([--with-lua], [build with lua support])], [], [with_lua=yes]) +if test X"$LUA_PKGCONFIG_NAME" = X ; then + LUA_PKGCONFIG_NAME=lua +fi AS_IF([test "$with_lua" != no],[ PKG_CHECK_MODULES([LUA], - [lua >= 5.1], + [${LUA_PKGCONFIG_NAME} >= 5.1], [AC_DEFINE(WITH_LUA, 1, [Build with lua support?])], [AC_MSG_ERROR([lua not present (--without-lua to disable)])]) AC_SUBST(LUA_CFLAGS) diff --git a/debian/control b/debian/control index 300fef560..a3a31bc4c 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,8 @@ Build-Depends: debhelper, libmagic-dev, libelf-dev, libdw-dev, - libdb-dev + libdb-dev, + liblua5.1-dev Maintainer: Markus Lehtonen <markus.lehtonen@linux.intel.com> Standards-Version: 3.9.3 Homepage: http://rpm.org/ diff --git a/debian/rules b/debian/rules index 30870a74f..594963018 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ CPPFLAGS += $(shell pkg-config --cflags nss) override_dh_auto_configure: dh_auto_configure -- --disable-dependency-tracking \ --libdir=/usr/lib/librpm-tizen \ - --without-lua \ + --with-lua \ --without-acl \ --without-cap \ --enable-shared \ @@ -18,6 +18,7 @@ override_dh_auto_configure: --with-external-db \ --build=${DEB_BUILD_GNU_CPU}-tizen-linux \ PYTHON_MODULENAME=$(python_mod_name) \ + LUA_PKGCONFIG_NAME=lua5.1 \ CPPFLAGS="$(CPPFLAGS)" override_dh_auto_install: diff --git a/packaging/librpm-tizen.spec b/packaging/librpm-tizen.spec index 021333d86..daf31b8fb 100644 --- a/packaging/librpm-tizen.spec +++ b/packaging/librpm-tizen.spec @@ -16,6 +16,11 @@ BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: gzip BuildRequires: libtool +%if 0%{?suse_version} +BuildRequires: pkgconfig(lua) < 5.2 +%else +BuildRequires: lua-devel +%endif BuildRequires: make BuildRequires: patch %if 0%{?fedora} || 0%{?centos_version} @@ -100,7 +105,7 @@ autoreconf -i -f %configure \ --libdir=%{_libdir}/%{name} \ --disable-dependency-tracking \ - --without-lua \ + --with-lua \ --without-acl \ --without-cap \ --enable-shared \ |