diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Makefile.in | 44 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.in | 8 |
4 files changed, 53 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 4a4c3b4..3aa34fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,11 @@ +# Default help file directory +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 \ utils.c main.c tcp.c list.c map.c tty.c \ ptr.c -powwow_LDFLAGS = -rdynamic -ldl +powwow_LDFLAGS = @dl_ldflags@ powwowdir = $(pkgincludedir) powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \ utils.h main.h tcp.h list.h map.h tty.h \ @@ -13,6 +16,7 @@ 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 diff --git a/Makefile.in b/Makefile.in index 7e967b2..53b082a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + SOURCES = $(catrw_SOURCES) $(follow_SOURCES) $(movie_SOURCES) $(muc_SOURCES) $(powwow_SOURCES) srcdir = @srcdir@ @@ -54,7 +55,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" \ - "$(DESTDIR)$(powwowdir)" + "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(powwowdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_catrw_OBJECTS = catrw.$(OBJEXT) @@ -95,6 +96,8 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +pkgdataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgdata_DATA) powwowHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(powwow_HEADERS) ETAGS = etags @@ -164,6 +167,7 @@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ +dl_ldflags = @dl_ldflags@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ includedir = @includedir@ @@ -181,11 +185,14 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ + +# Default help file directory +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 -powwow_LDFLAGS = -rdynamic -ldl +powwow_LDFLAGS = @dl_ldflags@ powwowdir = $(pkgincludedir) powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \ utils.h main.h tcp.h list.h map.h tty.h \ @@ -196,6 +203,7 @@ movie_SOURCES = movie.c 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 @@ -359,6 +367,23 @@ uninstall-man6: echo " rm -f '$(DESTDIR)$(man6dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man6dir)/$$inst"; \ done +install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done + +uninstall-pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgdata_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done install-powwowHEADERS: $(powwow_HEADERS) @$(NORMAL_INSTALL) test -z "$(powwowdir)" || $(mkdir_p) "$(DESTDIR)$(powwowdir)" @@ -554,9 +579,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(powwowdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(powwowdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -604,7 +629,7 @@ info: info-am info-am: -install-data-am: install-man install-powwowHEADERS +install-data-am: install-man install-pkgdataDATA install-powwowHEADERS install-exec-am: install-binPROGRAMS @@ -634,7 +659,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \ - uninstall-powwowHEADERS + uninstall-pkgdataDATA uninstall-powwowHEADERS uninstall-man: uninstall-man6 @@ -646,12 +671,13 @@ uninstall-man: uninstall-man6 html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-man install-man6 \ - install-powwowHEADERS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-pkgdataDATA install-powwowHEADERS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-info-am \ - uninstall-man uninstall-man6 uninstall-powwowHEADERS + uninstall-man uninstall-man6 uninstall-pkgdataDATA \ + uninstall-powwowHEADERS plugtest.so: plugtest.c @@ -308,7 +308,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE dl_ldflags CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1609,7 +1609,7 @@ fi # Define the identity of the package. PACKAGE=powwow - VERSION=1.2.7 + VERSION=1.2.8 cat >>confdefs.h <<_ACEOF @@ -3159,6 +3159,9 @@ _ACEOF fi +# Dynamic modules +dl_ldflags= + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then @@ -3223,11 +3226,7 @@ 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 - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBS="-ldl $LIBS" + dl_ldflags="-rdynamic -ldl" fi @@ -5155,6 +5154,7 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@dl_ldflags@,$dl_ldflags,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/configure.in b/configure.in index 15da9b6..84447d1 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. AC_INIT -AM_INIT_AUTOMAKE(powwow, 1.2.7) +AM_INIT_AUTOMAKE(powwow, 1.2.8) AC_ARG_ENABLE(vt100, AC_HELP_STRING([--enable-vt100], @@ -35,7 +35,11 @@ AC_PROG_CC AC_CHECK_LIB(curses, initscr) AC_CHECK_FUNC(regcomp,AC_DEFINE(USE_REGEXP)) AC_CHECK_FUNC(lrand48,,AC_DEFINE(USE_RANDOM)) -AC_CHECK_LIB(dl,dlopen) + +# Dynamic modules +dl_ldflags= +AC_SUBST(dl_ldflags) +AC_CHECK_LIB(dl,dlopen, AC_SUBST(dl_ldflags,"-rdynamic -ldl")) # Checks for header files. AC_CHECK_HEADERS([stdlib.h unistd.h]) |