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 lua                          Date:   14-Jun-2007 16:07:05
  Branch: HEAD                             Handle: 2007061415070401

  Modified files:
    lua                     Makefile.am
    rpm                     CHANGES configure.ac

  Log:
    portability: replace hard-coded -ldl (Linux) for Lua with Autoconf
    checks

  Summary:
    Revision    Changes     Path
    1.8         +2  -2      lua/Makefile.am
    1.1365      +1  -0      rpm/CHANGES
    2.78        +6  -0      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 Makefile.am
  --- lua/Makefile.am	5 Jun 2007 02:51:05 -0000	1.7
  +++ lua/Makefile.am	14 Jun 2007 14:07:05 -0000	1.8
  @@ -21,8 +21,8 @@
   luac_luac_SOURCES = luac/luac.c luac/print.c lopcodes.c
   luac_luac_CFLAGS = -DLUA_OPNAMES
   
  -liblua_la_CFLAGS = -DUSE_DLOPEN -DWITH_POSIX
  -liblua_la_LIBADD = -lm -ldl
  +liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DWITH_POSIX
  +liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm
   liblua_la_SOURCES = \
   		local/linit.c \
   		local/linit.lch \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1364 -r1.1365 CHANGES
  --- rpm/CHANGES	14 Jun 2007 12:35:55 -0000	1.1364
  +++ rpm/CHANGES	14 Jun 2007 14:07:05 -0000	1.1365
  @@ -1,5 +1,6 @@
   
   4.5 -> 5.0:
  +    - rse: portability: replace hard-coded -ldl (Linux) for Lua with Autoconf checks
       - rse: added devtool/devtool.conf build environment helper
       - rse: pruned tree from third-party libraries (except for zlib, db and lua)
       - goeran: updated "sv" translation.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.77 -r2.78 configure.ac
  --- rpm/configure.ac	14 Jun 2007 13:39:09 -0000	2.77
  +++ rpm/configure.ac	14 Jun 2007 14:07:04 -0000	2.78
  @@ -1141,6 +1141,8 @@
   WITH_LUA_LIB=
   WITH_LUA_SUBDIR=
   WITH_LUA_INCLUDE=
  +WITH_LUA_SUBDIR_DEF=
  +WITH_LUA_SUBDIR_LIB=
   withval=yes
   AC_ARG_WITH(lua, [  --with-lua              build with lua support ])
   if test $withval != no -a -d lua ; then
  @@ -1148,10 +1150,14 @@
     WITH_LUA_SUBDIR="lua"
     WITH_LUA_INCLUDE="-I\${top_srcdir}/${WITH_LUA_SUBDIR}/include -I\${top_srcdir}/${WITH_LUA_SUBDIR}/local"
     WITH_LUA_LIB="\$(top_builddir)/${WITH_LUA_SUBDIR}/liblua.la"
  +  AC_CHECK_LIB(dl, dlopen, [ LIBS="$LIBS -ldl"; WITH_LUA_SUBDIR_LIB="-ldl" ])
  +  AC_CHECK_FUNC(dlopen, [ WITH_LUA_SUBDIR_DEF="-DUSE_DLOPEN" ])
   fi
   AC_SUBST(WITH_LUA_LIB)
   AC_SUBST(WITH_LUA_SUBDIR)
   AC_SUBST(WITH_LUA_INCLUDE)
  +AC_SUBST(WITH_LUA_SUBDIR_DEF)
  +AC_SUBST(WITH_LUA_SUBDIR_LIB)
   
   WITH_SYCK_LIB=
   WITH_SYCK_SUBDIR=
  @@ .