RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 16-Jul-2007 10:02:38
Branch: HEAD Handle: 2007071609023601
Modified files:
rpm Makefile.am configure.ac
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am rpmlua.c
Log:
Automake horribly fails because a _conditional_
AC_CONFIG_FILES([lua/Makefile]) is just not possible. As Jeff already
removed the lua/ subdir and we can build against an external Lua
just fine, remove the support for the internal variant at all as
this seems to be the only possibility to make piece with Automake
here. For those who do not understand the background: lua/ used RPM's
Automake/Autoconf build facility (instead of its own stand-alone one)
and Automake/Autoconf just cannot be teached about a not existing but
supported lua/ subdir where files have to generated for.
Summary:
Revision Changes Path
2.188 +0 -2 rpm/Makefile.am
2.64 +0 -1 rpm/build/Makefile.am
2.179 +3 -14 rpm/configure.ac
2.159 +0 -1 rpm/lib/Makefile.am
1.25 +0 -1 rpm/misc/Makefile.am
1.74 +0 -1 rpm/python/Makefile.am
1.69 +0 -1 rpm/rpmdb/Makefile.am
1.96 +0 -1 rpm/rpmio/Makefile.am
2.17 +0 -10 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.187 -r2.188 Makefile.am
--- rpm/Makefile.am 10 Jul 2007 19:09:57 -0000 2.187
+++ rpm/Makefile.am 16 Jul 2007 08:02:36 -0000 2.188
@@ -26,7 +26,6 @@
SUBDIRS += \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
- @WITH_LUA_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
misc \
rpmio \
@@ -50,7 +49,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
myLDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.63 -r2.64 Makefile.am
--- rpm/build/Makefile.am 27 Jun 2007 20:20:26 -0000 2.63
+++ rpm/build/Makefile.am 16 Jul 2007 08:02:36 -0000 2.64
@@ -16,7 +16,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
pkgincdir = $(pkgincludedir)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.178 -r2.179 configure.ac
--- rpm/configure.ac 15 Jul 2007 21:50:16 -0000 2.178
+++ rpm/configure.ac 16 Jul 2007 08:02:36 -0000 2.179
@@ -825,24 +825,13 @@
AC_SUBST(DBAPI)
dnl # Lua
-WITH_LUA_SUBDIR_DEF=""
-WITH_LUA_SUBDIR_LIB=""
RPM_CHECK_LIB(
[Lua], [lua],
[lua], [lua_newstate], [lua.h],
- [no,external:internal:none], [lua:local],
- [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
- AC_CHECK_LIB(dl, dlopen, [ LIBS="-ldl $LIBS"; WITH_LUA_SUBDIR_LIB="-ldl" ])
- AC_CHECK_FUNC(dlopen, [ WITH_LUA_SUBDIR_DEF="-DLUA_USE_DLOPEN" ])
- AC_DEFINE(WITH_LUA_INTERNAL, 1, [Define if building with internal Lua])
- AC_CONFIG_FILES([lua/Makefile])
- else
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen)
- fi
+ [no,external:none], [],
+ [ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_FUNC(dlopen)
], [])
-AC_SUBST(WITH_LUA_SUBDIR_DEF)
-AC_SUBST(WITH_LUA_SUBDIR_LIB)
dnl # DMalloc
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.158 -r2.159 Makefile.am
--- rpm/lib/Makefile.am 9 Jul 2007 22:07:25 -0000 2.158
+++ rpm/lib/Makefile.am 16 Jul 2007 08:02:36 -0000 2.159
@@ -14,7 +14,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
EXTRA_DIST = getdate.y librpm.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.24 -r1.25 Makefile.am
--- rpm/misc/Makefile.am 27 Jun 2007 20:44:08 -0000 1.24
+++ rpm/misc/Makefile.am 16 Jul 2007 08:02:37 -0000 1.25
@@ -31,7 +31,6 @@
@ALLOCA@ \
@WITH_DB_LDFLAGS@ @WITH_DB_LIBS@ \
@WITH_ZLIB_LDFLAGS@ @WITH_ZLIB_LIBS@ \
- @WITH_LUA_LDFLAGS@ @WITH_LUA_LIBS@ \
@WITH_FILE_LDFLAGS@ @WITH_FILE_LIBS@
librpmmisc_la_DEPENDENCIES = \
@ALLOCA@
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.73 -r1.74 Makefile.am
--- rpm/python/Makefile.am 10 Jul 2007 20:38:28 -0000 1.73
+++ rpm/python/Makefile.am 16 Jul 2007 08:02:37 -0000 1.74
@@ -20,7 +20,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
-I$(pyincdir)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.68 -r1.69 Makefile.am
--- rpm/rpmdb/Makefile.am 28 Jun 2007 07:02:36 -0000 1.68
+++ rpm/rpmdb/Makefile.am 16 Jul 2007 08:02:37 -0000 1.69
@@ -14,7 +14,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
EXTRA_DIST = db3.c sqlite.c db_emu.h librpmdb.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.95 -r1.96 Makefile.am
--- rpm/rpmio/Makefile.am 15 Jul 2007 19:37:23 -0000 1.95
+++ rpm/rpmio/Makefile.am 16 Jul 2007 08:02:37 -0000 1.96
@@ -18,7 +18,6 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
- @WITH_LUA_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@
RPM_LDADD = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.16 -r2.17 rpmlua.c
--- rpm/rpmio/rpmlua.c 15 Jul 2007 18:23:17 -0000 2.16
+++ rpm/rpmio/rpmlua.c 16 Jul 2007 08:02:37 -0000 2.17
@@ -11,11 +11,6 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
-#ifdef WITH_LUA_INTERNAL
-#include <llocal.h>
-#include <lposix.h>
-#include <lrexlib.h>
-#endif
#include <unistd.h>
#include <assert.h>
@@ -67,11 +62,6 @@
{LUA_MATHLIBNAME, luaopen_math},
{LUA_DBLIBNAME, luaopen_debug},
/* local LUA libraries (RPM only) */
-#ifdef WITH_LUA_INTERNAL
- {"local", luaopen_local},
- {"posix", luaopen_posix},
- {"rex", luaopen_rex},
-#endif
{"rpm", luaopen_rpm},
{NULL, NULL},
};
@@ .
Received on Mon Jul 16 10:02:38 2007