From 41199241f4d878c24c9b6d7977b56ad562d0064f Mon Sep 17 00:00:00 2001 From: Steve Slaven Date: Mon, 21 Mar 2005 22:55:44 +0000 Subject: Updated debian version, make #module loaded objects export their symbols globally (needed to allow binary xs modules in perl to get to each others symbols) diff --git a/Makefile.am b/Makefile.am index 3aa34fd..a028339 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Default help file directory -AM_CFLAGS=-DPOWWOW_DIR=$(pkgdatadir) +AM_CFLAGS=-DPOWWOW_DIR=\"$(pkgdatadir)\" bin_PROGRAMS = powwow muc catrw follow movie powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \ @@ -17,9 +17,10 @@ catrw_SOURCES = catrw.c man_MANS = powwow.6 pkgdata_DATA = powwow.doc powwow.help -EXTRA_DIST = README README.follow README.term TODO Hacking Config.demo \ - powwow.doc powwow.help powwow.6 plugtest.c debian/rules \ - debian/control debian/changelog +EXTRA_DIST = README README.follow README.term README.modules \ + TODO Hacking Config.demo \ + powwow.doc powwow.help powwow.6 plugtest.c debian/rules \ + debian/control debian/changelog plugtest.so: plugtest.c gcc -shared -o plugtest.so plugtest.c diff --git a/Makefile.in b/Makefile.in index 53b082a..8da607f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,7 +187,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Default help file directory -AM_CFLAGS = -DPOWWOW_DIR=$(pkgdatadir) +AM_CFLAGS = -DPOWWOW_DIR=\"$(pkgdatadir)\" powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \ utils.c main.c tcp.c list.c map.c tty.c \ ptr.c @@ -204,9 +204,10 @@ follow_SOURCES = follow.c catrw_SOURCES = catrw.c man_MANS = powwow.6 pkgdata_DATA = powwow.doc powwow.help -EXTRA_DIST = README README.follow README.term TODO Hacking Config.demo \ - powwow.doc powwow.help powwow.6 plugtest.c debian/rules \ - debian/control debian/changelog +EXTRA_DIST = README README.follow README.term README.modules \ + TODO Hacking Config.demo \ + powwow.doc powwow.help powwow.6 plugtest.c debian/rules \ + debian/control debian/changelog all: all-am diff --git a/cmd.c b/cmd.c index 9fab77b..b525e8f 100644 --- a/cmd.c +++ b/cmd.c @@ -263,7 +263,7 @@ static void cmd_module __P1 (char *,arg) { } /* open lib */ - lib = dlopen( libname, RTLD_LAZY ); + lib = dlopen( libname, RTLD_GLOBAL | RTLD_LAZY ); if( ! lib ) { PRINTF( "#module error: %s\n", dlerror() ); return; diff --git a/configure b/configure index 88974ea..c7ea8a4 100755 --- a/configure +++ b/configure @@ -3226,7 +3226,11 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then - dl_ldflags="-rdynamic -ldl" + cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBDL 1 +_ACEOF + + dl_ldflags="-rdynamic -ldl" fi diff --git a/configure.in b/configure.in index 84447d1..18f0c1f 100644 --- a/configure.in +++ b/configure.in @@ -39,7 +39,9 @@ AC_CHECK_FUNC(lrand48,,AC_DEFINE(USE_RANDOM)) # Dynamic modules dl_ldflags= AC_SUBST(dl_ldflags) -AC_CHECK_LIB(dl,dlopen, AC_SUBST(dl_ldflags,"-rdynamic -ldl")) +AC_CHECK_LIB(dl,dlopen, + AC_DEFINE(HAVE_LIBDL) + AC_SUBST(dl_ldflags,"-rdynamic -ldl")) # Checks for header files. AC_CHECK_HEADERS([stdlib.h unistd.h]) diff --git a/debian/changelog b/debian/changelog index fee7716..8ee07d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -powwow (1.2.7) unstable; urgency=low +powwow (1.2.8) unstable; urgency=low * First release. - -- Your Name Mon, 20 Mar 2000 17:58:49 +0000 + -- Steve Slaven Mon, 20 Mar 2000 17:58:49 +0000 Local variables: mode: debian-changelog diff --git a/debian/control b/debian/control index e685d2a..a0a2ed3 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Standards-Version: 3.0.1 Package: powwow -Version: 1.2.7 +Version: 1.2.8 Description: a powerful and extensible curses based mud client powwow is a powerful mud client that supports triggers, aliases, multiple connections, and more. It is extensible through a plugin -- cgit v0.10.2