diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-03-28 12:47:34 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-03-28 12:54:42 +0300 |
| commit | f825911b73db44d1b2455a0495d2450dd0865402 (patch) | |
| tree | 2fb4687af93e59230ad83ddce3c3ce441ca4d78d /rpmio/Makefile.am | |
| parent | b098c173481e739b83b18900e241b6b467ed26cd (diff) | |
| download | rpm-f825911b73db44d1b2455a0495d2450dd0865402.tar.gz rpm-f825911b73db44d1b2455a0495d2450dd0865402.tar.bz2 rpm-f825911b73db44d1b2455a0495d2450dd0865402.zip | |
Use pkg-config to find Lua + determine flags (ticket #88)
- Additionally clean up the logic a bit and dont bother building
any lua-related bits if disabled
Diffstat (limited to 'rpmio/Makefile.am')
| -rw-r--r-- | rpmio/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index b94a77204..fee340836 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -2,7 +2,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_NSS_INCLUDE@ -AM_CPPFLAGS += @WITH_LUA_INCLUDE@ AM_CPPFLAGS += @WITH_POPT_INCLUDE@ AM_CPPFLAGS += -I$(top_srcdir)/misc AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" @@ -12,9 +11,9 @@ usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = \ argv.c base64.h base64.c digest.h digest.c macro.c \ - rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \ + rpmhook.c rpmio.c rpmlog.c rpmmalloc.c \ rpmpgp.c rpmsq.c rpmsw.c url.c \ - rpmio_internal.h rpmlua.h rpmhook.h \ + rpmio_internal.h rpmhook.h \ rpmstring.c rpmfileutil.c \ rpmkeyring.c @@ -22,7 +21,6 @@ librpmio_la_LDFLAGS = -version-info 2:0:0 librpmio_la_LIBADD = \ ../misc/libmisc.la \ @WITH_NSS_LIB@ \ - @WITH_LUA_LIB@ \ @WITH_BZ2_LIB@ \ @WITH_ZLIB_LIB@ \ @WITH_LIBELF_LIB@ \ @@ -30,8 +28,11 @@ librpmio_la_LIBADD = \ @WITH_LZMA_LIB@ \ -lpthread -if WITH_LUAEXT +if WITH_LUA AM_CPPFLAGS += -I$(top_srcdir)/luaext/ +AM_CPPFLAGS += @LUA_CFLAGS@ +librpmio_la_SOURCES += rpmlua.c rpmlua.h +librpmio_la_LIBADD += @LUA_LIBS@ librpmio_la_LIBADD += $(top_builddir)/luaext/libluaext.la endif |