Menu
▾
▴
benson-commit — Benson Commit Mailing List
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(27) |
Jul
(24) |
Aug
(64) |
Sep
(15) |
Oct
(72) |
Nov
(28) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(72) |
Feb
(58) |
Mar
(33) |
Apr
(3) |
May
(5) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(29) |
Dec
(12) |
| 2003 |
Jan
(37) |
Feb
(44) |
Mar
(13) |
Apr
(23) |
May
(9) |
Jun
(3) |
Jul
|
Aug
(7) |
Sep
(33) |
Oct
(30) |
Nov
(31) |
Dec
(11) |
| 2004 |
Jan
(4) |
Feb
(35) |
Mar
(14) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bob T. <bt...@us...> - 2001-09-01 18:40:08
|
Update of /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Constants In directory usw-pr-cvs1:/tmp/cvs-serv1925/Constants Log Message: Directory /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Constants added to the repository |
|
From: Bob T. <bt...@us...> - 2001-09-01 06:42:35
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv22403/src
Modified Files:
btrap.c
Log Message:
Added the BENSON_HOME define variable to config.h.in
Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** btrap.c 2001/08/31 03:42:23 1.5
--- btrap.c 2001/09/01 06:42:31 1.6
***************
*** 13,16 ****
--- 13,17 ----
char keyfile[256];
char message[1024];
+ char config_file[256];
PerlInterpreter* benson_perl;
SV* server_ref;
***************
*** 20,26 ****
bn_require_module("Benson::Handlers::Config");
bn_require_module("Benson::Handlers::Init");
! server_ref = bn_new_object("Benson::Server",0);
! bn_set_attribute(server_ref, "ConfigFile", "/tmp/benson3/etc/benson.conf");
bn_call_handler("Benson::Handlers::Config", server_ref);
--- 21,29 ----
bn_require_module("Benson::Handlers::Config");
bn_require_module("Benson::Handlers::Init");
! server_ref = bn_new_object("Benson::Server", 0);
! snprintf(config_file, 255,"%s/etc/benson.conf", BENSON_HOME);
! config_file[255] = '\0';
! bn_set_attribute(server_ref, "ConfigFile", config_file);
bn_call_handler("Benson::Handlers::Config", server_ref);
|
|
From: Bob T. <bt...@us...> - 2001-09-01 06:42:35
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv22403
Modified Files:
config.h.in configure configure.in
Log Message:
Added the BENSON_HOME define variable to config.h.in
Index: config.h.in
===================================================================
RCS file: /cvsroot/benson/benson3/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.h.in 2001/08/26 20:25:14 1.3
--- config.h.in 2001/09/01 06:42:31 1.4
***************
*** 1,4 ****
--- 1,7 ----
/* config.h.in. Generated automatically from configure.in by autoheader. */
+ /* "Benson home directory" */
+ #undef BENSON_HOME
+
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
***************
*** 54,57 ****
--- 57,63 ----
/* Version number of package */
#undef VERSION
+
+ /* Benson home directory */
+ #undef BENSON_HOME
/* Define if the X Window System is missing or not being used. */
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configure 2001/08/31 03:42:23 1.11
--- configure 2001/09/01 06:42:31 1.12
***************
*** 6646,6650 ****
LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:0
! echo "$as_me:6648: checking for open in -lm" >&5
echo $ECHO_N "checking for open in -lm... $ECHO_C" >&6
if test "${ac_cv_lib_m_open+set}" = set; then
--- 6646,6654 ----
LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:0
! cat >>confdefs.h <<EOF
! #define BENSON_HOME "$prefix"
[...2635 lines suppressed...]
{ (exit 1); exit 1; }; }
--- 9645,9649 ----
else
# /dev/null tree
! { { echo "$as_me:9647: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9758,9762 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9760: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 9762,9766 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9764: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configure.in 2001/08/31 03:42:23 1.11
--- configure.in 2001/09/01 06:42:31 1.12
***************
*** 20,23 ****
--- 20,24 ----
LIBTOOL_VERSION=$MAJOR_VERSION:$MINOR_VERSION:0
AC_SUBST(LIBTOOL_VERSION)
+ AC_DEFINE_UNQUOTED(BENSON_HOME, "$prefix", "Benson home directory")
AC_CHECK_LIB(m, open)
***************
*** 136,140 ****
CFLAGS="$CFLAGS -pg"
fi
-
--- 137,140 ----
|
|
From: Bob T. <bt...@us...> - 2001-09-01 02:09:29
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv20397
Modified Files:
Makefile.in
Log Message:
Ran automake to execute make in the conf directory
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in 2001/08/26 20:25:14 1.3
--- Makefile.in 2001/09/01 02:09:25 1.4
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = .
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 73,86 ****
LN_S = @LN_S@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@
am__quote = @am__quote@
--- 75,87 ----
LN_S = @LN_S@
MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PERL_CFLAGS = @PERL_CFLAGS@
+ PERL_LDFLAGS = @PERL_LDFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
***************
*** 94,142 ****
uniqpath = @uniqpath@
! SUBDIRS = src include
! subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
- Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 \
- config.guess config.h.in config.sub configure configure.in \
- install-sh ltconfig ltmain.sh missing mkinstalldirs
- DIST_SUBDIRS = $(SUBDIRS)
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
! .SUFFIXES:
! mostlyclean-libtool:
! -rm -f *.lo
! clean-libtool:
! -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$@ $(SHELL) ./config.status
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h
@if test ! -f $@; then \
--- 95,130 ----
uniqpath = @uniqpath@
! SUBDIRS = src include conf
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
! config.h.in config.sub configure configure.in install-sh ltconfig \
! ltmain.sh missing mkinstalldirs
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
config.h: stamp-h
@if test ! -f $@; then \
***************
*** 145,169 ****
else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h stamp-hT
- @echo timestamp > stamp-hT 2> /dev/null
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(SHELL) ./config.status
! @mv stamp-hT stamp-h
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/./stamp-h.in
@if test ! -f $@; then \
! rm -f $(srcdir)/./stamp-h.in; \
! $(MAKE) $(srcdir)/./stamp-h.in; \
else :; fi
! $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
! @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
! @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
cd $(top_srcdir) && $(AUTOHEADER)
! @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
distclean-hdr:
-rm -f config.h
- uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
--- 133,158 ----
else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(SHELL) ./config.status
! @echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
@if test ! -f $@; then \
! rm -f $(srcdir)/stamp-h.in; \
! $(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
! $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
! @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
!
! mostlyclean-hdr:
!
! clean-hdr:
distclean-hdr:
-rm -f config.h
+ maintainer-clean-hdr:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
***************
*** 172,176 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
--- 161,170 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
***************
*** 195,208 ****
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 189,197 ----
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 223,285 ****
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- top_distdir = .
- # Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION)
!
! GZIP_ENV = --best
distdir: $(DISTFILES)
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
--- 212,298 ----
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
! mostlyclean-tags:
+ clean-tags:
+
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
+ # This target untars the dist file and tries a VPATH configuration. Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+ -rm -rf $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) dist
+ -rm -rf $(distdir)
+ @banner="$(distdir).tar.gz is ready for distribution"; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"
+ dist: distdir
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
+ dist-all: distdir
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
distdir: $(DISTFILES)
! -rm -rf $(distdir)
mkdir $(distdir)
+ -chmod 777 $(distdir)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
***************
*** 289,359 ****
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || (echo "Error: files left after uninstall" 1>&2; \
! exit 1) ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist \
! && $(MAKE) $(AM_MAKEFLAGS) distclean \
! && rm -f $(distdir).tar.gz \
! && (test `find . -type f -print | wc -l` -eq 0 \
! || (echo "Error: files left after distclean" 1>&2; \
! exit 1) )
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
! all-am: Makefile config.h
! installdirs: installdirs-recursive
! installdirs-am:
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
- uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-recursive
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- 302,340 ----
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
! install-exec-am:
install-exec: install-exec-recursive
+
+ install-data-am:
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am:
! uninstall: uninstall-recursive
! all-am: Makefile config.h
! all-redirect: all-recursive-am
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
!
!
mostlyclean-generic:
***************
*** 361,426 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-generic clean-libtool mostlyclean-am
!
! dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
! distclean: distclean-recursive
! -rm -f config.status config.cache config.log
! distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
! distclean-tags
!
! dvi: dvi-recursive
!
! dvi-am:
!
! info: info-recursive
!
! info-am:
! install-data-am:
! install-exec-am:
! install-info: install-info-recursive
! install-man:
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
!
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-recursive
!
! mostlyclean-am: mostlyclean-generic mostlyclean-libtool
!
! uninstall-am: uninstall-info-am
! uninstall-info: uninstall-info-recursive
- .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive dist dist-all \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 342,384 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-recursive
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
! install-exec-am install-exec install-data-am install-data install-am \
! install uninstall-am uninstall all-redirect all-am all installdirs-am \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
From: Bob T. <bt...@us...> - 2001-08-31 14:18:02
|
Update of /cvsroot/benson/benson3/conf In directory usw-pr-cvs1:/tmp/cvs-serv20144 Removed Files: benson.conf Log Message: Removed the created benson.conf file --- benson.conf DELETED --- |
|
From: Bob T. <bt...@us...> - 2001-08-31 14:07:03
|
Update of /cvsroot/benson/benson3/conf In directory usw-pr-cvs1:/tmp/cvs-serv30649/conf Added Files: Makefile.am Makefile.in benson.conf benson.conf.tmpl Log Message: Added a whole helluvalotta perl stuff, and the beginning of the configuration stuff. Fixed the non portable shared library problem --- NEW FILE: Makefile.am --- distclean: test -z benson.conf || rm -f benson.conf clean: test -z benson.conf || rm -f benson.conf install-data-local: $(mkinstalldirs) $(prefix)/etc; \ $(mkinstalldirs) $(prefix)/logs; \ sed -e "s:prefixpath:@prefix@:" benson.conf.tmpl > benson.conf; \ if [ ! -f "$(sysconfdir)/benson.conf" ]; then \ cp benson.conf $(sysconfdir)/; \ else \ echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/benson.conf]"; \ fi; \ chmod 644 $(sysconfdir)/benson.conf; --- NEW FILE: Makefile.in --- # Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ HAVE_X11 = @HAVE_X11@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBTOOL_VERSION = @LIBTOOL_VERSION@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ perlpath = @perlpath@ pythonpath = @pythonpath@ sedpath = @sedpath@ sortpath = @sortpath@ tclpath = @tclpath@ trpath = @trpath@ uniqpath = @uniqpath@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu conf/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = conf distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu conf/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done info-am: info: info-am dvi-am: dvi: dvi-am check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am install-exec-am: install-exec: install-exec-am install-data-am: install-data-local install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am uninstall-am: uninstall: uninstall-am all-am: Makefile all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: mostlyclean-am: mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am .PHONY: tags distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-local install-data-am install-data install-am install \ uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean distclean: test -z benson.conf || rm -f benson.conf clean: test -z benson.conf || rm -f benson.conf install-data-local: $(mkinstalldirs) $(prefix)/bin; \ $(mkinstalldirs) $(prefix)/etc; \ $(mkinstalldirs) $(prefix)/logs; \ sed -e "s:prefixpath:@prefix@:" benson.conf.tmpl > benson.conf; \ cp bensonctl $(prefix)/bin; \ if [ ! -f "$(sysconfdir)/benson.conf" ]; then \ cp benson.conf $(sysconfdir)/; \ else \ echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/benson.conf]"; \ fi; \ chmod 644 $(sysconfdir)/benson.conf; # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: benson.conf --- # Filename: benson.cfg # Master configuration file for bensond, trap, ack, and alertlist # Modifications to this file can affect the entire system, edit with care # A config tester will be built in due time. # # ServerRoot: <string> # Value is passed, and available for use for the Handlers. # ServerRoot /tmp/benson3 # # Hostname: <string> # Value is automatically passed as the source of traps, Config.pm performs # a chop'd call to /bin/hostname to get a default value #Hostname sample.name.tld # # DomainName: <string> # Value is appended to hostname for hosts that don't append domain name # This is not needed if your OS does. (i.e. linux) #DomainName newportal.com # # Forwarder: <string> # Value is automatically used to determine destination of traps and # queries # Forwarder gateway.newportal.com # # Mode: agent|gateway|collector # Value is passed and affects the Benson::Handlers::Action, and # Benson::Handlers::Monitor Mode agent # # Port: <integer> # Port this server will listen on. # Port 9021 # # LoopInterval: <integer> # Number of seconds to sleep betwen Monitor handler interations # LoopInterval 10 # # MaxAlertsPerMinute: <integer> # Sets a cap on the number of alerts that can come into the alert system # MaxAlertsPerMinute 75 # # TraceLevel: <integer> (1-4) # Various levels of tracing 1 is lowest level 4 is highest # TraceLevel 1 #################################################### # Database Support # #################################################### # # DBIConnectString: <string> # This sets the connection information for the DBI driver # #DBIConnectString "dbi:Oracle:db1" # # DBIUsername: <string> # This sets the username for the database account # #DBIUsername benson # # DBIPassword: <string> # This sets the password for the username # #DBIPassword benson #################################################### # SSL Support (README.ssl for more information) # #################################################### # # SSLenable: on|off # Enable SSL support for the Benson applications. # SSLenable off # # SSLcert: <string> # Path of the SSL certificate for this node, overrides the default. # SSLcert /tmp/benson3/etc/ssl/cert.pem # # SSLkey: <string> # Path of the SSL private key for this node, overrides the default. # SSLkey /tmp/benson3/etc/ssl/key.pem # # SSLCAfile: <string> # Path of the CA SSL certificate. This helps for SSLverify ;) # SSLCAfile /usr/local/ssl/demoCA/cacert.pem # # SSLCApath: <string> # Root path for the CA directories. # SSLCApath /usr/local/ssl/demoCA/ # # SSLverify: <string> # SSL verify depth. This is used to figure out how high up the CA root # we need to verify. Default is 0, (i.e. accept anything) SSLverify 0 --- NEW FILE: benson.conf.tmpl --- # Filename: benson.cfg # Master configuration file for bensond, trap, ack, and alertlist # Modifications to this file can affect the entire system, edit with care # A config tester will be built in due time. # # ServerRoot: <string> # Value is passed, and available for use for the Handlers. # ServerRoot prefixpath # # Hostname: <string> # Value is automatically passed as the source of traps, Config.pm performs # a chop'd call to /bin/hostname to get a default value #Hostname sample.name.tld # # DomainName: <string> # Value is appended to hostname for hosts that don't append domain name # This is not needed if your OS does. (i.e. linux) #DomainName newportal.com # # Forwarder: <string> # Value is automatically used to determine destination of traps and # queries # Forwarder gateway.newportal.com # # Mode: agent|gateway|collector # Value is passed and affects the Benson::Handlers::Action, and # Benson::Handlers::Monitor Mode agent # # Port: <integer> # Port this server will listen on. # Port 9021 # # LoopInterval: <integer> # Number of seconds to sleep betwen Monitor handler interations # LoopInterval 10 # # MaxAlertsPerMinute: <integer> # Sets a cap on the number of alerts that can come into the alert system # MaxAlertsPerMinute 75 # # TraceLevel: <integer> (1-4) # Various levels of tracing 1 is lowest level 4 is highest # TraceLevel 1 #################################################### # Database Support # #################################################### # # DBIConnectString: <string> # This sets the connection information for the DBI driver # #DBIConnectString "dbi:Oracle:db1" # # DBIUsername: <string> # This sets the username for the database account # #DBIUsername benson # # DBIPassword: <string> # This sets the password for the username # #DBIPassword benson #################################################### # SSL Support (README.ssl for more information) # #################################################### # # SSLenable: on|off # Enable SSL support for the Benson applications. # SSLenable off # # SSLcert: <string> # Path of the SSL certificate for this node, overrides the default. # SSLcert prefixpath/etc/ssl/cert.pem # # SSLkey: <string> # Path of the SSL private key for this node, overrides the default. # SSLkey prefixpath/etc/ssl/key.pem # # SSLCAfile: <string> # Path of the CA SSL certificate. This helps for SSLverify ;) # SSLCAfile /usr/local/ssl/demoCA/cacert.pem # # SSLCApath: <string> # Root path for the CA directories. # SSLCApath /usr/local/ssl/demoCA/ # # SSLverify: <string> # SSL verify depth. This is used to figure out how high up the CA root # we need to verify. Default is 0, (i.e. accept anything) SSLverify 0 |
|
From: Bob T. <bt...@us...> - 2001-08-31 14:06:35
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv30649
Modified Files:
Makefile.am configure configure.in
Log Message:
Added a whole helluvalotta perl stuff, and the beginning of the configuration stuff. Fixed the non portable shared library problem
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 2001/08/21 03:52:01 1.3
--- Makefile.am 2001/08/31 03:42:23 1.4
***************
*** 1,2 ****
! SUBDIRS = src include
!
--- 1 ----
! SUBDIRS = src include conf
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure 2001/08/26 20:25:14 1.10
--- configure 2001/08/31 03:42:23 1.11
***************
*** 8799,8805 ****
echo "$as_me:8799: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
! echo "$as_me:8803: result: not found, building without Perl." >&5
echo "${ECHO_T}not found, building without Perl." >&6
perl=no
--- 8799,8806 ----
echo "$as_me:8799: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
+
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
! echo "$as_me:8804: result: not found, building without Perl." >&5
echo "${ECHO_T}not found, building without Perl." >&6
perl=no
***************
*** 8814,8821 ****
fi
PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
! echo "$as_me:8816: result: ok" >&5
echo "${ECHO_T}ok" >&6
CFLAGS="$CFLAGS $PERL_CFLAGS"
! LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 8815,8822 ----
fi
PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
! echo "$as_me:8817: result: ok" >&5
echo "${ECHO_T}ok" >&6
CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
***************
*** 8824,8828 ****
# Extract the first word of ""python"", so it can be a program name with args.
set dummy "python"; ac_word=$2
! echo "$as_me:8826: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_pythonpath+set}" = set; then
--- 8825,8829 ----
# Extract the first word of ""python"", so it can be a program name with args.
set dummy "python"; ac_word=$2
! echo "$as_me:8827: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_pythonpath+set}" = set; then
***************
*** 8841,8845 ****
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_pythonpath="$ac_dir/$ac_word"
! echo "$as_me:8843: found $ac_dir/$ac_word" >&5
break
fi
--- 8842,8846 ----
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_pythonpath="$ac_dir/$ac_word"
! echo "$as_me:8844: found $ac_dir/$ac_word" >&5
break
fi
***************
*** 8852,8865 ****
if test -n "$pythonpath"; then
! echo "$as_me:8854: result: $pythonpath" >&5
echo "${ECHO_T}$pythonpath" >&6
else
! echo "$as_me:8857: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:8861: checking for Python compile flags" >&5
echo $ECHO_N "checking for Python compile flags... $ECHO_C" >&6
! echo "$as_me:8863: result: not found, building without Python." >&5
echo "${ECHO_T}not found, building without Python." >&6
fi
--- 8853,8866 ----
if test -n "$pythonpath"; then
! echo "$as_me:8855: result: $pythonpath" >&5
echo "${ECHO_T}$pythonpath" >&6
else
! echo "$as_me:8858: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:8862: checking for Python compile flags" >&5
echo $ECHO_N "checking for Python compile flags... $ECHO_C" >&6
! echo "$as_me:8864: result: not found, building without Python." >&5
echo "${ECHO_T}not found, building without Python." >&6
fi
***************
*** 8868,8872 ****
# Extract the first word of ""tclsh"", so it can be a program name with args.
set dummy "tclsh"; ac_word=$2
! echo "$as_me:8870: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_tclpath+set}" = set; then
--- 8869,8873 ----
# Extract the first word of ""tclsh"", so it can be a program name with args.
set dummy "tclsh"; ac_word=$2
! echo "$as_me:8871: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_tclpath+set}" = set; then
***************
*** 8885,8889 ****
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_tclpath="$ac_dir/$ac_word"
! echo "$as_me:8887: found $ac_dir/$ac_word" >&5
break
fi
--- 8886,8890 ----
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_tclpath="$ac_dir/$ac_word"
! echo "$as_me:8888: found $ac_dir/$ac_word" >&5
break
fi
***************
*** 8896,8917 ****
if test -n "$tclpath"; then
! echo "$as_me:8898: result: $tclpath" >&5
echo "${ECHO_T}$tclpath" >&6
else
! echo "$as_me:8901: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:8905: checking version" >&5
echo $ECHO_N "checking version... $ECHO_C" >&6
TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
if test "_$TCL_VERSION" = _ ; then
! echo "$as_me:8909: result: version not found, building without Tcl." >&5
echo "${ECHO_T}version not found, building without Tcl." >&6
else
! echo "$as_me:8912: result: $TCL_VERSION" >&5
echo "${ECHO_T}$TCL_VERSION" >&6
fi
! echo "$as_me:8915: checking for Tcl compile flags" >&5
echo $ECHO_N "checking for Tcl compile flags... $ECHO_C" >&6
TCL_CFLAGS="-I/usr/include/"
--- 8897,8918 ----
if test -n "$tclpath"; then
! echo "$as_me:8899: result: $tclpath" >&5
echo "${ECHO_T}$tclpath" >&6
else
! echo "$as_me:8902: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:8906: checking version" >&5
echo $ECHO_N "checking version... $ECHO_C" >&6
TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
if test "_$TCL_VERSION" = _ ; then
! echo "$as_me:8910: result: version not found, building without Tcl." >&5
echo "${ECHO_T}version not found, building without Tcl." >&6
else
! echo "$as_me:8913: result: $TCL_VERSION" >&5
echo "${ECHO_T}$TCL_VERSION" >&6
fi
! echo "$as_me:8916: checking for Tcl compile flags" >&5
echo $ECHO_N "checking for Tcl compile flags... $ECHO_C" >&6
TCL_CFLAGS="-I/usr/include/"
***************
*** 8919,8923 ****
CFLAGS="$CFLAGS $TCL_CFLAGS"
LIBS="$LIBS $TCL_LDFLAGS"
! echo "$as_me:8921: result: ok" >&5
echo "${ECHO_T}ok" >&6
# AC_MSG_RESULT([not found, building without Tcl.])
--- 8920,8924 ----
CFLAGS="$CFLAGS $TCL_CFLAGS"
LIBS="$LIBS $TCL_LDFLAGS"
! echo "$as_me:8922: result: ok" >&5
echo "${ECHO_T}ok" >&6
# AC_MSG_RESULT([not found, building without Tcl.])
***************
*** 8937,8941 ****
#AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
--- 8938,8942 ----
#AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! ac_config_files="$ac_config_files Makefile conf/Makefile include/Makefile src/Makefile src/perl/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
***************
*** 9017,9021 ****
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:9019: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
--- 9018,9022 ----
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:9020: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
***************
*** 9193,9197 ****
--he | --h)
# Conflict between --help and --header
! { { echo "$as_me:9195: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
--- 9194,9198 ----
--he | --h)
# Conflict between --help and --header
! { { echo "$as_me:9196: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
***************
*** 9212,9216 ****
# This is an error.
! -*) { { echo "$as_me:9214: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
--- 9213,9217 ----
# This is an error.
! -*) { { echo "$as_me:9215: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
***************
*** 9258,9266 ****
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
! *) { { echo "$as_me:9264: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
--- 9259,9269 ----
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "conf/Makefile" ) CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/perl/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
! *) { { echo "$as_me:9267: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
***************
*** 9404,9407 ****
--- 9407,9412 ----
s,@sortpath@,$sortpath,;t t
s,@perlpath@,$perlpath,;t t
+ s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t
+ s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
s,@pythonpath@,$pythonpath,;t t
s,@tclpath@,$tclpath,;t t
***************
*** 9520,9524 ****
if test x"$ac_file" != x-; then
! { echo "$as_me:9522: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
--- 9525,9529 ----
if test x"$ac_file" != x-; then
! { echo "$as_me:9527: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
***************
*** 9538,9542 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:9540: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 9543,9547 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:9545: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9551,9555 ****
else
# /dev/null tree
! { { echo "$as_me:9553: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 9556,9560 ----
else
# /dev/null tree
! { { echo "$as_me:9558: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9612,9616 ****
esac
! test x"$ac_file" != x- && { echo "$as_me:9614: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
--- 9617,9621 ----
esac
! test x"$ac_file" != x- && { echo "$as_me:9619: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
***************
*** 9623,9627 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:9625: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 9628,9632 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:9630: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9636,9640 ****
else
# /dev/null tree
! { { echo "$as_me:9638: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 9641,9645 ----
else
# /dev/null tree
! { { echo "$as_me:9643: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9753,9757 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9755: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 9758,9762 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9760: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.in 2001/08/26 20:25:14 1.10
--- configure.in 2001/08/31 03:42:23 1.11
***************
*** 78,81 ****
--- 78,83 ----
AC_MSG_RESULT($PERL_VERSION)
AC_MSG_CHECKING(for Perl compile flags)
+ AC_SUBST(PERL_CFLAGS)
+ AC_SUBST(PERL_LDFLAGS)
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
***************
*** 94,98 ****
AC_MSG_RESULT(ok)
CFLAGS="$CFLAGS $PERL_CFLAGS"
! LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 96,100 ----
AC_MSG_RESULT(ok)
CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
***************
*** 138,141 ****
#AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! AC_OUTPUT([Makefile include/Makefile src/Makefile])
--- 140,144 ----
#AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! AC_OUTPUT([Makefile conf/Makefile include/Makefile \
! src/Makefile src/perl/Makefile])
|
|
From: Bob T. <bt...@us...> - 2001-08-31 14:06:34
|
Update of /cvsroot/benson/benson3/include/benson In directory usw-pr-cvs1:/tmp/cvs-serv30649/include/benson Modified Files: benson.h Log Message: Added a whole helluvalotta perl stuff, and the beginning of the configuration stuff. Fixed the non portable shared library problem Index: benson.h =================================================================== RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** benson.h 2001/08/21 02:47:14 1.3 --- benson.h 2001/08/31 03:42:23 1.4 *************** *** 21,23 **** --- 21,25 ---- #define DHFILE "dh1024.pem" + int err_exit(char *string); + #endif /* __benson_h */ |
|
From: Bob T. <bt...@us...> - 2001-08-31 14:06:34
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv30649/src
Modified Files:
Makefile.am Makefile.in bensond.c btrap.c ssl.c
Added Files:
error.c
Removed Files:
perl_util.c
Log Message:
Added a whole helluvalotta perl stuff, and the beginning of the configuration stuff. Fixed the non portable shared library problem
--- NEW FILE: error.c ---
#include "benson/benson.h"
int err_exit(char *string)
{
fprintf(stderr,"%s\n",string);
exit(0);
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.am 2001/08/27 02:49:18 1.9
--- Makefile.am 2001/08/31 03:42:23 1.10
***************
*** 4,13 ****
bensond_LDADD = libbenson.la
btrap_SOURCES = btrap.c
! btrap_LDADD = libbenson.la
ack_SOURCES = acknowledge.c
ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS =
--- 4,13 ----
bensond_LDADD = libbenson.la
btrap_SOURCES = btrap.c
! btrap_LDADD = libbenson.la perl/libbnperl.a @PERL_LDFLAGS@
ack_SOURCES = acknowledge.c
ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c error.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS = perl
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in 2001/08/27 02:49:18 1.10
--- Makefile.in 2001/08/31 03:42:23 1.11
***************
*** 79,82 ****
--- 79,84 ----
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PERL_CFLAGS = @PERL_CFLAGS@
+ PERL_LDFLAGS = @PERL_LDFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
***************
*** 98,109 ****
bensond_LDADD = libbenson.la
btrap_SOURCES = btrap.c
! btrap_LDADD = libbenson.la
ack_SOURCES = acknowledge.c
ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS =
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
--- 100,111 ----
bensond_LDADD = libbenson.la
btrap_SOURCES = btrap.c
! btrap_LDADD = libbenson.la perl/libbnperl.a @PERL_LDFLAGS@
ack_SOURCES = acknowledge.c
ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c error.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS = perl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
***************
*** 121,125 ****
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
bin_PROGRAMS = btrap$(EXEEXT) ack$(EXEEXT)
sbin_PROGRAMS = bensond$(EXEEXT)
--- 123,127 ----
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo error.lo
bin_PROGRAMS = btrap$(EXEEXT) ack$(EXEEXT)
sbin_PROGRAMS = bensond$(EXEEXT)
***************
*** 127,131 ****
btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_DEPENDENCIES = libbenson.la
btrap_LDFLAGS =
ack_OBJECTS = acknowledge.$(OBJEXT)
--- 129,133 ----
btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_DEPENDENCIES = libbenson.la perl/libbnperl.a
btrap_LDFLAGS =
ack_OBJECTS = acknowledge.$(OBJEXT)
***************
*** 148,152 ****
GZIP_ENV = --best
DEP_FILES = .deps/acknowledge.P .deps/bensond.P .deps/btrap.P \
! .deps/network.P .deps/shm_wrapper.P .deps/ssl.P
SOURCES = $(libbenson_la_SOURCES) $(btrap_SOURCES) $(ack_SOURCES) $(bensond_SOURCES)
OBJECTS = $(libbenson_la_OBJECTS) $(btrap_OBJECTS) $(ack_OBJECTS) $(bensond_OBJECTS)
--- 150,154 ----
GZIP_ENV = --best
DEP_FILES = .deps/acknowledge.P .deps/bensond.P .deps/btrap.P \
! .deps/error.P .deps/network.P .deps/shm_wrapper.P .deps/ssl.P
SOURCES = $(libbenson_la_SOURCES) $(btrap_SOURCES) $(ack_SOURCES) $(bensond_SOURCES)
OBJECTS = $(libbenson_la_OBJECTS) $(btrap_OBJECTS) $(ack_OBJECTS) $(bensond_OBJECTS)
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** bensond.c 2001/08/27 22:55:23 1.10
--- bensond.c 2001/08/31 03:42:23 1.11
***************
*** 46,54 ****
int main(int argc, char *argv[], char *env[])
{
! int sock, s;
! BIO *sbio;
! SSL_CTX *ctx;
! SSL *ssl;
! int r;
int read_offset = 0;
unsigned short function;
--- 46,50 ----
int main(int argc, char *argv[], char *env[])
{
! int listenfd, connfd, r;
int read_offset = 0;
unsigned short function;
***************
*** 57,78 ****
unsigned char packet[1024];
struct benson_header packet_hdr;
- // trap = malloc(sizeof(struct benson_trap));
- // ctx=initialize_ctx(KEYFILE,PASSWORD);
- // load_dh_params(ctx,DHFILE);
- // generate_eph_rsa_key(ctx);
-
signal(SIGCHLD, SIG_IGN);
! sock = bn_tcp_listen();
while(1) {
do {
! if((s=accept(sock,0,0))<0)
perror("accept() failed");
} while(errno == EINTR);
if(pid=fork()) {
! close(s);
}
else {
--- 53,69 ----
unsigned char packet[1024];
struct benson_header packet_hdr;
signal(SIGCHLD, SIG_IGN);
! listenfd = bn_tcp_listen();
while(1) {
do {
! if((connfd=accept(listenfd,0,0))<0)
perror("accept() failed");
} while(errno == EINTR);
if(pid=fork()) {
! close(connfd);
}
else {
***************
*** 80,84 ****
while(1) {
if(r > 0) {
! r = read(s, &packet, 1024);
printf("reading (%i bytes) (%i total)...\n", r, read_offset);
if((read_offset + r) < 4096) {
--- 71,75 ----
while(1) {
if(r > 0) {
! r = read(connfd, &packet, 1024);
printf("reading (%i bytes) (%i total)...\n", r, read_offset);
if((read_offset + r) < 4096) {
***************
*** 104,119 ****
}
}
! close(s);
! close(sock);
exit(0);
- // sbio=BIO_new_socket(s,BIO_NOCLOSE);
- // ssl=SSL_new(ctx);
- // SSL_set_bio(ssl,sbio,sbio);
-
- // if((r=SSL_accept(ssl)<=0))
- // berr_exit("SSL accept error");
}
}
- // destroy_ctx(ctx);
exit(0);
}
--- 95,103 ----
}
}
! close(connfd);
! close(listenfd);
exit(0);
}
}
exit(0);
}
Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** btrap.c 2001/08/23 04:49:57 1.4
--- btrap.c 2001/08/31 03:42:23 1.5
***************
*** 13,16 ****
--- 13,27 ----
char keyfile[256];
char message[1024];
+ PerlInterpreter* benson_perl;
+ SV* server_ref;
+
+ benson_perl = bn_perl_initialize(env,1);
+ bn_require_module("Benson::Server");
+ bn_require_module("Benson::Handlers::Config");
+ bn_require_module("Benson::Handlers::Init");
+ server_ref = bn_new_object("Benson::Server",0);
+
+ bn_set_attribute(server_ref, "ConfigFile", "/tmp/benson3/etc/benson.conf");
+ bn_call_handler("Benson::Handlers::Config", server_ref);
while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {
Index: ssl.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/ssl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ssl.c 2001/08/14 04:23:57 1.4
--- ssl.c 2001/08/31 03:42:23 1.5
***************
*** 1,4 ****
--- 1,6 ----
#include "benson/benson.h"
+ #ifdef HAVE_SSL
+
static char *pass;
BIO *bio_err=0;
***************
*** 9,18 ****
}
- int err_exit(char *string)
- {
- fprintf(stderr,"%s\n",string);
- exit(0);
- }
-
int berr_exit(char *string)
{
--- 11,14 ----
***************
*** 98,99 ****
--- 94,96 ----
SSL_CTX_free(ctx);
}
+ #endif /* HAVE_SSL */
--- perl_util.c DELETED ---
|
|
From: Bob T. <bt...@us...> - 2001-08-31 14:06:32
|
Update of /cvsroot/benson/benson3/src/perl
In directory usw-pr-cvs1:/tmp/cvs-serv30649/src/perl
Added Files:
Makefile.am Makefile.in perl_util.c
Log Message:
Added a whole helluvalotta perl stuff, and the beginning of the configuration stuff. Fixed the non portable shared library problem
--- NEW FILE: Makefile.am ---
noinst_LIBRARIES = libbnperl.a
libbnperl_a_SOURCES = perl_util.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
AMTAR = @AMTAR@
AS = @AS@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL_CFLAGS = @PERL_CFLAGS@
PERL_LDFLAGS = @PERL_LDFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
perlpath = @perlpath@
pythonpath = @pythonpath@
sedpath = @sedpath@
sortpath = @sortpath@
tclpath = @tclpath@
trpath = @trpath@
uniqpath = @uniqpath@
noinst_LIBRARIES = libbnperl.a
libbnperl_a_SOURCES = perl_util.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
LIBRARIES = $(noinst_LIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
libbnperl_a_LIBADD =
libbnperl_a_OBJECTS = perl_util.$(OBJEXT)
AR = ar
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
DEP_FILES = .deps/perl_util.P
SOURCES = $(libbnperl_a_SOURCES)
OBJECTS = $(libbnperl_a_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu src/perl/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-noinstLIBRARIES:
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
distclean-noinstLIBRARIES:
maintainer-clean-noinstLIBRARIES:
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
$(COMPILE) -c `cygpath -w $<`
.s.o:
$(COMPILE) -c $<
.S.o:
$(COMPILE) -c $<
mostlyclean-compile:
-rm -f *.o core *.core
-rm -f *.$(OBJEXT)
clean-compile:
distclean-compile:
-rm -f *.tab.c
maintainer-clean-compile:
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
.S.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
maintainer-clean-libtool:
libbnperl.a: $(libbnperl_a_OBJECTS) $(libbnperl_a_DEPENDENCIES)
-rm -f libbnperl.a
$(AR) cru libbnperl.a $(libbnperl_a_OBJECTS) $(libbnperl_a_LIBADD)
$(RANLIB) libbnperl.a
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = src/perl
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/perl/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
mostlyclean-depend:
clean-depend:
distclean-depend:
-rm -rf .deps
maintainer-clean-depend:
%.o: %.c
@echo '$(COMPILE) -c $<'; \
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
%.lo: %.c
@echo '$(LTCOMPILE) -c $<'; \
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
< .deps/$(*F).pp > .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am:
uninstall: uninstall-am
all-am: Makefile $(LIBRARIES)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-noinstLIBRARIES distclean-compile \
distclean-libtool distclean-tags distclean-depend \
distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-depend \
maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir \
mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- NEW FILE: perl_util.c ---
#include "benson/benson.h"
void xs_init (pTHXo);
void boot_DynaLoader (pTHXo_ CV* cv);
void
xs_init(pTHXo)
{
char *file = __FILE__;
dXSUB_SYS;
/* DynaLoader is a special case */
newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
}
void
bn_perl_destroy(PerlInterpreter *benson_perl)
{
perl_destruct(benson_perl);
perl_free(benson_perl);
}
PerlInterpreter*
bn_perl_initialize(char **env, int warning) {
PerlInterpreter *benson_perl;
int perlc = 0;
char *perlv[] = {NULL, NULL, NULL};
if(warning) {
perlv[perlc++] = "-w";
}
perlv[perlc++] = "/dev/null";
benson_perl = perl_alloc();
perl_construct(benson_perl);
perl_parse(benson_perl, xs_init, perlc, perlv, env);
return benson_perl;
}
int
bn_require_module(const char *pkgname) {
dTHR;
SV *req = sv_newmortal();
dTHRCTX;
sv_setpvn(req, "require ",8);
sv_catpv(req, pkgname);
perl_eval_sv(req, G_DISCARD);
if(SvTRUE(ERRSV)) {
STRLEN n_a;
printf("Error - PerlObject::require_module(\"%s\")\n", pkgname);
printf("%s",SvPV(ERRSV,n_a));
return 1;
}
return 0;
}
SV*
bn_new_object(const char *pkgname, int argc, ...) {
SV* classref;
SV* p;
int count, ctr;
va_list ap;
dSP;
ENTER;
SAVETMPS;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVpv(pkgname,0)));
va_start(ap, pkgname);
for(ctr=0; ctr<argc; ctr++) {
p = va_arg(ap, SV*);
if(p == NULL) break;
if(!SvROK(p)) break;
XPUSHs(p);
}
va_end(ap);
PUTBACK;
count = call_method("new", G_SCALAR);
SPAGAIN;
if(count != 1) {
err_exit("Error bn_new_object()");
} else {
classref = SvREFCNT_inc(POPs);
}
PUTBACK;
FREETMPS;
LEAVE;
if(SvTRUE(ERRSV)) {
STRLEN n_a;
err_exit("Perl Exception - bn_new_object()");
}
return classref;
}
SV*
bn_set_attribute(SV *pkg, const char *method, const char *value)
{
SV* attribute_ref;
dSP;
ENTER;
SAVETMPS;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVsv(pkg)));
XPUSHs(newSVpv(value,0));
PUTBACK;
call_method(method, G_SCALAR);
SPAGAIN;
attribute_ref = SvREFCNT_inc(POPs);
FREETMPS;
LEAVE;
return attribute_ref;
}
SV*
bn_call_handler(const char *pkgname, SV* objref)
{
SV* handler;
SV* classref;
int count;
dSP;
ENTER;
SAVETMPS;
PUSHMARK(SP);
XPUSHs(objref);
PUTBACK;
handler = sv_2mortal(newSVpv(pkgname, 0));
sv_catpv(handler, "::handler");
count = call_sv(handler, G_SCALAR | G_EVAL);
SPAGAIN;
if(count != 1) {
err_exit("Error bn_call_handler()");
} else {
classref = POPs;
classref = SvREFCNT_inc(classref);
}
PUTBACK;
FREETMPS;
LEAVE;
if(SvTRUE(ERRSV)) {
STRLEN n_a;
fprintf(stderr, "%s", SvPV(ERRSV,n_a));
err_exit("Error bn_call_handler()");
}
return classref;
}
|
|
From: Bob T. <bt...@us...> - 2001-08-31 14:05:08
|
Update of /cvsroot/benson/benson3/conf In directory usw-pr-cvs1:/tmp/cvs-serv28775/conf Log Message: Directory /cvsroot/benson/benson3/conf added to the repository |
|
From: Bob T. <bt...@us...> - 2001-08-27 22:55:25
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv24216/src
Modified Files:
bensond.c
Log Message:
Modified the benson code to decode the network byte order
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** bensond.c 2001/08/27 02:49:18 1.9
--- bensond.c 2001/08/27 22:55:23 1.10
***************
*** 52,55 ****
--- 52,56 ----
int r;
int read_offset = 0;
+ unsigned short function;
pid_t pid;
unsigned char buffer[4096];
***************
*** 62,72 ****
// generate_eph_rsa_key(ctx);
! signal(SIGCHLD, sig_chld);
sock = bn_tcp_listen();
while(1) {
! if((s=accept(sock,0,0))<0)
! err_exit("accept() failed");
if(pid=fork()) {
--- 63,75 ----
// generate_eph_rsa_key(ctx);
! signal(SIGCHLD, SIG_IGN);
sock = bn_tcp_listen();
while(1) {
! do {
! if((s=accept(sock,0,0))<0)
! perror("accept() failed");
! } while(errno == EINTR);
if(pid=fork()) {
***************
*** 89,97 ****
memcpy(&packet_hdr, buffer, 4095);
read_offset = 0;
! if(packet_hdr.function == BENSON_TRAP) {
process_trap(packet_hdr);
! } else if(packet_hdr.function == BENSON_ALERTLIST) {
process_alertlist(packet_hdr);
! } else if(packet_hdr.function == BENSON_ACKNOWLEDGE) {
process_acknowledge(packet_hdr);
}
--- 92,102 ----
memcpy(&packet_hdr, buffer, 4095);
read_offset = 0;
! function = ntohs(packet_hdr.function);
! printf("Benson function: %i\n", function);
! if(function == BENSON_TRAP) {
process_trap(packet_hdr);
! } else if(function == BENSON_ALERTLIST) {
process_alertlist(packet_hdr);
! } else if(function == BENSON_ACKNOWLEDGE) {
process_acknowledge(packet_hdr);
}
|
|
From: Bob T. <bt...@us...> - 2001-08-27 22:54:29
|
Update of /cvsroot/benson/benson3/src In directory usw-pr-cvs1:/tmp/cvs-serv24005 Modified Files: network.c Log Message: Added htons for bn_acknowledge function short Index: network.c =================================================================== RCS file: /cvsroot/benson/benson3/src/network.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** network.c 2001/08/27 22:38:00 1.6 --- network.c 2001/08/27 22:54:26 1.7 *************** *** 106,110 **** packet_hdr.version[32] = '\0'; ! packet_hdr.function = BENSON_ACKNOWLEDGE; strncpy(packet_hdr.destination, destination, 255); --- 106,110 ---- packet_hdr.version[32] = '\0'; ! packet_hdr.function = htons(BENSON_ACKNOWLEDGE); strncpy(packet_hdr.destination, destination, 255); |
|
From: Bob T. <bt...@us...> - 2001-08-27 22:38:04
|
Update of /cvsroot/benson/benson3/include/benson
In directory usw-pr-cvs1:/tmp/cvs-serv20326/include/benson
Modified Files:
network.h
Log Message:
Using to htons to convert byte order
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/network.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** network.h 2001/08/27 02:49:18 1.5
--- network.h 2001/08/27 22:38:00 1.6
***************
*** 24,28 ****
struct benson_alertlist {
! unsigned int max_num_alerts;
};
--- 24,28 ----
struct benson_alertlist {
! unsigned short max_num_alerts;
};
***************
*** 30,34 ****
unsigned char benson[7];
unsigned char version[32];
! unsigned int function;
unsigned char destination[256];
unsigned char agent[256];
--- 30,34 ----
unsigned char benson[7];
unsigned char version[32];
! unsigned short function;
unsigned char destination[256];
unsigned char agent[256];
|
|
From: Bob T. <bt...@us...> - 2001-08-27 22:38:04
|
Update of /cvsroot/benson/benson3/src In directory usw-pr-cvs1:/tmp/cvs-serv20326/src Modified Files: network.c Log Message: Using to htons to convert byte order Index: network.c =================================================================== RCS file: /cvsroot/benson/benson3/src/network.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** network.c 2001/08/27 02:49:18 1.5 --- network.c 2001/08/27 22:38:00 1.6 *************** *** 63,67 **** packet_hdr.version[32] = '\0'; ! packet_hdr.function = BENSON_TRAP; strncpy(packet_hdr.destination, destination, 255); --- 63,67 ---- packet_hdr.version[32] = '\0'; ! packet_hdr.function = htons(BENSON_TRAP); strncpy(packet_hdr.destination, destination, 255); |
|
From: Bob T. <bt...@us...> - 2001-08-27 02:49:21
|
Update of /cvsroot/benson/benson3/include/benson
In directory usw-pr-cvs1:/tmp/cvs-serv6223/include/benson
Modified Files:
network.h
Log Message:
Getting my shit together with the different types of messages and command line utilities
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/network.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** network.h 2001/08/26 20:16:34 1.4
--- network.h 2001/08/27 02:49:18 1.5
***************
*** 9,12 ****
--- 9,16 ----
#include <fcntl.h>
+ #define BENSON_TRAP 1
+ #define BENSON_ALERTLIST 2
+ #define BENSON_ACKNOWLEDGE 3
+
struct benson_trap {
unsigned char severity[256];
***************
*** 36,43 ****
};
-
int bn_tcp_connect(char *forwarder);
int bn_tcp_listen(void);
int bn_send_trap (char *destination, char *source, char *severity, char *subsystem, char *message);
#endif /* __network_h */
--- 40,47 ----
};
int bn_tcp_connect(char *forwarder);
int bn_tcp_listen(void);
int bn_send_trap (char *destination, char *source, char *severity, char *subsystem, char *message);
+ int bn_acknowledge (char *destination, char *source, char *identity);
#endif /* __network_h */
|
|
From: Bob T. <bt...@us...> - 2001-08-27 02:49:21
|
Update of /cvsroot/benson/benson3/include
In directory usw-pr-cvs1:/tmp/cvs-serv6223/include
Modified Files:
Makefile.in
Log Message:
Getting my shit together with the different types of messages and command line utilities
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/include/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in 2001/08/27 02:35:06 1.4
--- Makefile.in 2001/08/27 02:49:18 1.5
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ..
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 73,76 ****
--- 75,79 ----
LN_S = @LN_S@
MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 79,86 ****
STRIP = @STRIP@
VERSION = @VERSION@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@
am__quote = @am__quote@
--- 82,85 ----
***************
*** 94,220 ****
uniqpath = @uniqpath@
! include_HEADERS = benson/benson.h benson/shm_wrapper.h \
! benson/ssl.h benson/perl_util.h benson/network.h
- subdir = include
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
! HEADERS = $(include_HEADERS)
- DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
- all: all-am
.SUFFIXES:
! mostlyclean-libtool:
! -rm -f *.lo
- clean-libtool:
- -rm -rf .libs _libs
- distclean-libtool:
- -rm -f libtool
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu include/Makefile
- Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
- uninstall-info-am:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
! @list='$(include_HEADERS)'; for p in $$list; do \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
! rm -f $(DESTDIR)$(includedir)/$$f; \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! $(mkinstalldirs) $(distdir)/benson
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(HEADERS)
!
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(includedir)
!
! install: install-am
install-exec: install-exec-am
install-data: install-data-am
- uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-am
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- 93,211 ----
uniqpath = @uniqpath@
! include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h benson/perl_util.h benson/network.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! HEADERS = $(include_HEADERS)
!
! DIST_COMMON = Makefile.am Makefile.in
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+ TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
.SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
! list='$(include_HEADERS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(includedir)/$$p; \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = include
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+ info-am:
+ info: info-am
+ dvi-am:
+ dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-exec-local
install-exec: install-exec-am
+
+ install-data-am: install-includeHEADERS
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-am
! uninstall-am: uninstall-includeHEADERS
! uninstall: uninstall-am
! all-am: Makefile $(HEADERS)
! all-redirect: all-am
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(includedir)
!
!
mostlyclean-generic:
***************
*** 222,279 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
!
! clean-am: clean-generic clean-libtool mostlyclean-am
!
! distclean: distclean-am
!
! distclean-am: clean-am distclean-generic distclean-libtool \
! distclean-tags
!
! dvi: dvi-am
!
! dvi-am:
!
! info: info-am
! info-am:
! install-data-am: install-includeHEADERS
! install-exec-am: install-exec-local
! install-info: install-info-am
! install-man:
! installcheck-am:
maintainer-clean: maintainer-clean-am
-
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
- mostlyclean: mostlyclean-am
-
- mostlyclean-am: mostlyclean-generic mostlyclean-libtool
! uninstall-am: uninstall-includeHEADERS uninstall-info-am
- .PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-libtool distclean distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-exec-local install-includeHEADERS \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool tags uninstall uninstall-am \
- uninstall-includeHEADERS uninstall-info-am
-
install-exec-local:
# automake won't make the benson directory in prefix/include/
--- 213,250 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-tags clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-tags distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: uninstall-includeHEADERS install-includeHEADERS tags \
! mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
! distdir info-am info dvi-am dvi check check-am installcheck-am \
! installcheck install-exec-local install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
install-exec-local:
# automake won't make the benson directory in prefix/include/
***************
*** 281,284 ****
--- 252,256 ----
$(mkinstalldirs) $(DESTDIR)$(includedir)/benson; \
$(mkinstalldirs) $(DESTDIR)$(includedir);
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
From: Bob T. <bt...@us...> - 2001-08-27 02:49:21
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv6223/src
Modified Files:
Makefile.am Makefile.in bensond.c network.c
Added Files:
acknowledge.c
Log Message:
Getting my shit together with the different types of messages and command line utilities
--- NEW FILE: acknowledge.c ---
#include "benson/benson.h"
int main(int argc, char *argv[], char *env[]) {
int index = 0;
int c = 0;
int verbose = 0;
int version = 0;
unsigned char source[256];
unsigned char destination[256];
unsigned char identity[256];
unsigned char keyfile[256];
unsigned char certfile[256];
while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {
switch(c)
{
#ifdef HAVE_SSL
case 'c':
strncpy(certfile, optarg, 255);
certfile[255] = '\0';
break;
case 'k':
strncpy(keyfile, optarg, 255);
keyfile[255] = '\0';
break;
#endif
case 's':
strncpy(source, optarg, 255);
source[255] = '\0';
break;
case 'd':
strncpy(destination, optarg, 255);
destination[255] = '\0';
break;
case 'v':
verbose = 1;
break;
case 'V':
version = 1;
break;
default:
break;
}
}
if(version)
{
printf("%s %s\n", PACKAGE, VERSION);
exit(0);
}
if((argc - optind) == 1)
{
index = optind;
strncpy(identity, argv[index++], 255);
identity[255] = '\0';
if(verbose) {
printf("Source: %s\n", source);
printf("Destination: %s\n", destination);
printf("Identity: %s\n", identity);
}
bn_acknowledge(destination,source,identity);
} else {
if(verbose) {
printf("Benson Distributed Monitoring System (%s %s)\n", PACKAGE, VERSION);
printf("Copyright (C) 1999, 2000, 2001 Bob Tribit\n\n");
printf("This program is distributed in the hope that it will be useful,\n");
printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
printf("GNU General Public License for more details.\n\n");
}
printf("Usage: %s [options] identity\n", argv[0]);
printf("Acknowledges an alert in the benson alert database\n\n");
#ifdef HAVE_SSL
printf(" -c cert.pem path to this agents SSL certificate\n");
printf(" -k key.pem path to this agents SSL key\n");
#endif
printf(" -s srcaddr source address for trap\n");
printf(" -d destaddr destination address for trap\n");
printf(" -v verbose output\n");
printf(" -V display version information\n\n");
printf("Report bugs to <ben...@ne...>\n");
}
return 0;
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Makefile.am 2001/08/23 04:49:57 1.8
--- Makefile.am 2001/08/27 02:49:18 1.9
***************
*** 1,8 ****
! bin_PROGRAMS = btrap
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c
- btrap_SOURCES = btrap.c
bensond_LDADD = libbenson.la
btrap_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
--- 1,10 ----
! bin_PROGRAMS = btrap ack
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c
bensond_LDADD = libbenson.la
+ btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la
+ ack_SOURCES = acknowledge.c
+ ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in 2001/08/26 20:25:15 1.9
--- Makefile.in 2001/08/27 02:49:18 1.10
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,16 ****
# PARTICULAR PURPOSE.
- @SET_MAKE@
SHELL = @SHELL@
--- 11,14 ----
***************
*** 34,40 ****
--- 32,42 ----
includedir = @includedir@
oldincludedir = /usr/include
+
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ..
***************
*** 45,53 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 47,55 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 73,76 ****
--- 75,79 ----
LN_S = @LN_S@
MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 79,86 ****
STRIP = @STRIP@
VERSION = @VERSION@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_LIBS = @X_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@
am__quote = @am__quote@
--- 82,85 ----
***************
*** 94,103 ****
uniqpath = @uniqpath@
! bin_PROGRAMS = btrap
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c
- btrap_SOURCES = btrap.c
bensond_LDADD = libbenson.la
btrap_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
--- 93,104 ----
uniqpath = @uniqpath@
! bin_PROGRAMS = btrap ack
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c
bensond_LDADD = libbenson.la
+ btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la
+ ack_SOURCES = acknowledge.c
+ ack_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
***************
*** 105,178 ****
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
SUBDIRS =
- subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
!
! libbenson_la_LIBADD =
! am_libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
! libbenson_la_OBJECTS = $(am_libbenson_la_OBJECTS)
! bin_PROGRAMS = btrap$(EXEEXT)
! sbin_PROGRAMS = bensond$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
!
! am_bensond_OBJECTS = bensond.$(OBJEXT)
! bensond_OBJECTS = $(am_bensond_OBJECTS)
! bensond_DEPENDENCIES = libbenson.la
! bensond_LDFLAGS =
! am_btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_OBJECTS = $(am_btrap_OBJECTS)
! btrap_DEPENDENCIES = libbenson.la
! btrap_LDFLAGS =
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bensond.Po $(DEPDIR)/btrap.Po \
! @AMDEP_TRUE@ $(DEPDIR)/network.Plo $(DEPDIR)/shm_wrapper.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/ssl.Plo
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
! DIST_SOURCES = $(libbenson_la_SOURCES) $(bensond_SOURCES) \
! $(btrap_SOURCES)
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(libbenson_la_SOURCES) $(bensond_SOURCES) $(btrap_SOURCES)
! all: all-recursive
.SUFFIXES:
! .SUFFIXES: .c .lo .o .obj
! mostlyclean-libtool:
! -rm -f *.lo
- clean-libtool:
- -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- 106,175 ----
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
SUBDIRS =
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
!
! DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! X_CFLAGS = @X_CFLAGS@
! X_LIBS = @X_LIBS@
! X_EXTRA_LIBS = @X_EXTRA_LIBS@
! X_PRE_LIBS = @X_PRE_LIBS@
! libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
! bin_PROGRAMS = btrap$(EXEEXT) ack$(EXEEXT)
! sbin_PROGRAMS = bensond$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
!
! btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_DEPENDENCIES = libbenson.la
! btrap_LDFLAGS =
! ack_OBJECTS = acknowledge.$(OBJEXT)
! ack_DEPENDENCIES = libbenson.la
! ack_LDFLAGS =
! bensond_OBJECTS = bensond.$(OBJEXT)
! bensond_DEPENDENCIES = libbenson.la
! bensond_LDFLAGS =
CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/acknowledge.P .deps/bensond.P .deps/btrap.P \
+ .deps/network.P .deps/shm_wrapper.P .deps/ssl.P
+ SOURCES = $(libbenson_la_SOURCES) $(btrap_SOURCES) $(ack_SOURCES) $(bensond_SOURCES)
+ OBJECTS = $(libbenson_la_OBJECTS) $(btrap_OBJECTS) $(ack_OBJECTS) $(bensond_OBJECTS)
+
+ all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .lo .o .obj .s
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
! mostlyclean-libLTLIBRARIES:
!
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
!
! distclean-libLTLIBRARIES:
!
! maintainer-clean-libLTLIBRARIES:
!
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
***************
*** 180,185 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
--- 177,182 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
***************
*** 187,210 ****
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! libbenson.la: $(libbenson_la_OBJECTS) $(libbenson_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libbenson_la_LDFLAGS) $(libbenson_la_OBJECTS) $(libbenson_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! || test -f $$p1 \
! ; then \
! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
--- 184,248 ----
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! $(COMPILE) -c `cygpath -w $<`
!
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
!
! mostlyclean-compile:
! -rm -f *.o core *.core
! -rm -f *.$(OBJEXT)
!
! clean-compile:
!
! distclean-compile:
! -rm -f *.tab.c
!
! maintainer-clean-compile:
!
! .s.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
!
! .S.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
!
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
!
! maintainer-clean-libtool:
!
! libbenson.la: $(libbenson_la_OBJECTS) $(libbenson_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libbenson_la_LDFLAGS) $(libbenson_la_OBJECTS) $(libbenson_la_LIBADD) $(LIBS)
+
+ mostlyclean-binPROGRAMS:
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+ distclean-binPROGRAMS:
+
+ maintainer-clean-binPROGRAMS:
+
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
***************
*** 212,234 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! || test -f $$p1 \
! ; then \
! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
else :; fi; \
done
--- 250,273 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! mostlyclean-sbinPROGRAMS:
!
! clean-sbinPROGRAMS:
! -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
!
! distclean-sbinPROGRAMS:
!
! maintainer-clean-sbinPROGRAMS:
!
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
***************
*** 236,288 ****
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(sbin_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
! rm -f $(DESTDIR)$(sbindir)/$$f; \
done
! clean-sbinPROGRAMS:
! -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
! bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! @rm -f bensond$(EXEEXT)
! $(LINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
! btrap$(EXEEXT): $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
@rm -f btrap$(EXEEXT)
$(LINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
! mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
! distclean-compile:
! -rm -f *.tab.c
!
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bensond.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/btrap.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/network.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shm_wrapper.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ssl.Plo@am__quote@
!
! distclean-depend:
! -rm -rf $(DEPDIR)
!
! .c.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
!
! .c.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `cygpath -w $<`
!
! .c.lo:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
! CCDEPMODE = @CCDEPMODE@
! uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
--- 275,293 ----
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(sbin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! btrap$(EXEEXT): $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
@rm -f btrap$(EXEEXT)
$(LINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
! ack$(EXEEXT): $(ack_OBJECTS) $(ack_DEPENDENCIES)
! @rm -f ack$(EXEEXT)
! $(LINK) $(ack_LDFLAGS) $(ack_OBJECTS) $(ack_LDADD) $(LIBS)
! bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! @rm -f bensond$(EXEEXT)
! $(LINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
# This directory's subdirectories are mostly independent; you can cd
***************
*** 292,296 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
--- 297,306 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
***************
*** 315,328 ****
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 325,333 ----
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 343,400 ****
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
--- 348,401 ----
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = src
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
***************
*** 404,437 ****
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
- check-am: all-am
- check: check-recursive
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
- install-binPROGRAMS: install-libLTLIBRARIES
! installdirs: installdirs-recursive
! installdirs-am:
! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
- uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-recursive
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
--- 405,476 ----
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
! -include $(DEP_FILES)
!
! mostlyclean-depend:
!
! clean-depend:
!
! distclean-depend:
! -rm -rf .deps
!
! maintainer-clean-depend:
!
! %.o: %.c
! @echo '$(COMPILE) -c $<'; \
! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.c
! @echo '$(LTCOMPILE) -c $<'; \
! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
! check-am: all-am
! check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
! install-sbinPROGRAMS
install-exec: install-exec-recursive
+
+ install-data-am:
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
! uninstall-sbinPROGRAMS
! uninstall: uninstall-recursive
! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
! all-redirect: all-recursive
install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
! $(DESTDIR)$(sbindir)
!
!
mostlyclean-generic:
***************
*** 439,509 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
!
! clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
! clean-libtool clean-sbinPROGRAMS mostlyclean-am
!
! distclean: distclean-recursive
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags
!
! dvi: dvi-recursive
!
! dvi-am:
!
! info: info-recursive
!
! info-am:
! install-data-am:
! install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
! install-sbinPROGRAMS
! install-info: install-info-recursive
! install-man:
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
- mostlyclean: mostlyclean-recursive
-
- mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
! uninstall-info: uninstall-info-recursive
- .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
- clean-libtool clean-recursive clean-sbinPROGRAMS distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-libtool distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-binPROGRAMS install-data install-data-am \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-libLTLIBRARIES install-man \
- install-recursive install-sbinPROGRAMS install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- installdirs-recursive maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am \
- uninstall-info-recursive uninstall-libLTLIBRARIES \
- uninstall-recursive uninstall-sbinPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 478,541 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-binPROGRAMS \
! mostlyclean-sbinPROGRAMS mostlyclean-tags \
! mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
! clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
! clean-depend clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-libLTLIBRARIES distclean-compile \
! distclean-libtool distclean-binPROGRAMS \
! distclean-sbinPROGRAMS distclean-tags distclean-depend \
! distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-recursive
! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
! maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-binPROGRAMS \
! maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
! distclean-compile clean-compile maintainer-clean-compile \
! mostlyclean-libtool distclean-libtool clean-libtool \
! maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
! clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
! install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
! clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
! install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
! install-exec-recursive uninstall-exec-recursive installdirs-recursive \
! uninstalldirs-recursive all-recursive check-recursive \
! installcheck-recursive info-recursive dvi-recursive \
! mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** bensond.c 2001/08/27 02:35:06 1.8
--- bensond.c 2001/08/27 02:49:18 1.9
***************
*** 89,97 ****
memcpy(&packet_hdr, buffer, 4095);
read_offset = 0;
! if(packet_hdr.function == 1) {
process_trap(packet_hdr);
! } else if(packet_hdr.function == 2) {
process_alertlist(packet_hdr);
! } else if(packet_hdr.function == 3) {
process_acknowledge(packet_hdr);
}
--- 89,97 ----
memcpy(&packet_hdr, buffer, 4095);
read_offset = 0;
! if(packet_hdr.function == BENSON_TRAP) {
process_trap(packet_hdr);
! } else if(packet_hdr.function == BENSON_ALERTLIST) {
process_alertlist(packet_hdr);
! } else if(packet_hdr.function == BENSON_ACKNOWLEDGE) {
process_acknowledge(packet_hdr);
}
Index: network.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** network.c 2001/08/26 20:16:34 1.4
--- network.c 2001/08/27 02:49:18 1.5
***************
*** 63,67 ****
packet_hdr.version[32] = '\0';
! packet_hdr.function = 1;
strncpy(packet_hdr.destination, destination, 255);
--- 63,67 ----
packet_hdr.version[32] = '\0';
! packet_hdr.function = BENSON_TRAP;
strncpy(packet_hdr.destination, destination, 255);
***************
*** 84,85 ****
--- 84,123 ----
return 0;
}
+
+ int bn_acknowledge (char *destination, char *source,
+ char *identity)
+ {
+ int sock;
+ int ofcmode;
+ struct benson_header packet_hdr;
+ char response[255];
+ char rc[2];
+
+ sock = bn_tcp_connect(destination);
+ ofcmode = fcntl(sock,F_GETFL,0);
+ ofcmode |= O_NDELAY;
+ if(fcntl(sock,F_SETFL,ofcmode))
+ err_exit("Couldn't make socket nonblocking");
+
+ strncpy(packet_hdr.benson, PACKAGE, 6);
+ packet_hdr.benson[6] = '\0';
+
+ strncpy(packet_hdr.version, VERSION, 32);
+ packet_hdr.version[32] = '\0';
+
+ packet_hdr.function = BENSON_ACKNOWLEDGE;
+
+ strncpy(packet_hdr.destination, destination, 255);
+ packet_hdr.destination[255] = '\0';
+
+ strncpy(packet_hdr.agent, source, 255);
+ packet_hdr.agent[255] = '\0';
+
+ strncpy(packet_hdr.data.acknowledge.identity, identity, 255);
+ packet_hdr.data.acknowledge.identity[255] = '\0';
+
+ write(sock, &packet_hdr, sizeof(struct benson_header));
+ close(sock);
+ return 0;
+ }
+
|
|
From: Bob T. <bt...@us...> - 2001-08-27 02:35:10
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv2537/src
Modified Files:
bensond.c
Log Message:
Added handlers for other command line applications
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** bensond.c 2001/08/26 23:24:31 1.7
--- bensond.c 2001/08/27 02:35:06 1.8
***************
*** 12,15 ****
--- 12,47 ----
}
+ void process_trap (struct benson_header packet_hdr)
+ {
+ printf("%s %i\n",packet_hdr.benson, sizeof(packet_hdr.benson));
+ printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
+ printf("%s %i\n",packet_hdr.destination, sizeof(packet_hdr.destination));
+ printf("%s %i\n",packet_hdr.agent, sizeof(packet_hdr.agent));
+ printf("%s %i\n",packet_hdr.data.trap.severity, sizeof(packet_hdr.data.trap.severity));
+ printf("%s %i\n",packet_hdr.data.trap.subsystem, sizeof(packet_hdr.data.trap.subsystem));
+ printf("%s %i\n",packet_hdr.data.trap.message, sizeof(packet_hdr.data.trap.message));
+ return;
+ }
+
+ void process_acknowledge (struct benson_header packet_hdr)
+ {
+ printf("%s %i\n",packet_hdr.benson, sizeof(packet_hdr.benson));
+ printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
+ printf("%s %i\n",packet_hdr.destination, sizeof(packet_hdr.destination));
+ printf("%s %i\n",packet_hdr.agent, sizeof(packet_hdr.agent));
+ printf("%s %i\n",packet_hdr.data.acknowledge.identity, sizeof(packet_hdr.data.acknowledge.identity));
+ return;
+ }
+
+ void process_alertlist (struct benson_header packet_hdr)
+ {
+ printf("%s %i\n",packet_hdr.benson, sizeof(packet_hdr.benson));
+ printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
+ printf("%s %i\n",packet_hdr.destination, sizeof(packet_hdr.destination));
+ printf("%s %i\n",packet_hdr.agent, sizeof(packet_hdr.agent));
+ printf("%i\n",packet_hdr.data.alertlist.max_num_alerts);
+ return;
+ }
+
int main(int argc, char *argv[], char *env[])
{
***************
*** 47,51 ****
r = read(s, &packet, 1024);
printf("reading (%i bytes) (%i total)...\n", r, read_offset);
! memcpy(&buffer[read_offset], packet, 1024);
read_offset = read_offset + r;
} else {
--- 79,88 ----
r = read(s, &packet, 1024);
printf("reading (%i bytes) (%i total)...\n", r, read_offset);
! if((read_offset + r) < 4096) {
! memcpy(&buffer[read_offset], packet, r);
! } else {
! printf("Error: message too large\n");
! break;
! }
read_offset = read_offset + r;
} else {
***************
*** 53,63 ****
read_offset = 0;
if(packet_hdr.function == 1) {
! printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
! printf("%s %i\n",packet_hdr.agent, sizeof(packet_hdr.agent));
! printf("%s %i\n",packet_hdr.data.trap.severity, sizeof(packet_hdr.data.trap.severity));
! printf("%s %i\n",packet_hdr.data.trap.subsystem, sizeof(packet_hdr.data.trap.subsystem));
! printf("%s %i\n",packet_hdr.data.trap.message, sizeof(packet_hdr.data.trap.message));
} else if(packet_hdr.function == 2) {
! printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
}
break;
--- 90,98 ----
read_offset = 0;
if(packet_hdr.function == 1) {
! process_trap(packet_hdr);
} else if(packet_hdr.function == 2) {
! process_alertlist(packet_hdr);
! } else if(packet_hdr.function == 3) {
! process_acknowledge(packet_hdr);
}
break;
|
|
From: Bob T. <bt...@us...> - 2001-08-27 02:35:10
|
Update of /cvsroot/benson/benson3/include In directory usw-pr-cvs1:/tmp/cvs-serv2537/include Modified Files: Makefile.am Makefile.in Log Message: Added handlers for other command line applications Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/include/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 2001/08/21 02:49:22 1.2 --- Makefile.am 2001/08/27 02:35:06 1.3 *************** *** 1,3 **** ! include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h benson/perl_util.h install-exec-local: --- 1,4 ---- ! include_HEADERS = benson/benson.h benson/shm_wrapper.h \ ! benson/ssl.h benson/perl_util.h benson/network.h install-exec-local: Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/include/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.in 2001/08/26 20:25:14 1.3 --- Makefile.in 2001/08/27 02:35:06 1.4 *************** *** 94,98 **** uniqpath = @uniqpath@ ! include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h benson/perl_util.h subdir = include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 94,100 ---- uniqpath = @uniqpath@ ! include_HEADERS = benson/benson.h benson/shm_wrapper.h \ ! benson/ssl.h benson/perl_util.h benson/network.h ! subdir = include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
|
From: Bob T. <bt...@us...> - 2001-08-26 23:24:34
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv30670/src
Modified Files:
bensond.c
Log Message:
Fixed the network code, so it may handle the large packets.
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bensond.c 2001/08/26 20:16:34 1.6
--- bensond.c 2001/08/26 23:24:31 1.7
***************
*** 19,24 ****
SSL *ssl;
int r;
pid_t pid;
! char buf[1024];
struct benson_header packet_hdr;
// trap = malloc(sizeof(struct benson_trap));
--- 19,26 ----
SSL *ssl;
int r;
+ int read_offset = 0;
pid_t pid;
! unsigned char buffer[4096];
! unsigned char packet[1024];
struct benson_header packet_hdr;
// trap = malloc(sizeof(struct benson_trap));
***************
*** 43,49 ****
while(1) {
if(r > 0) {
! r=read(s, &packet_hdr, sizeof(struct benson_header));
! printf("reading (%i bytes)...\n", r);
} else {
if(packet_hdr.function == 1) {
printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
--- 45,55 ----
while(1) {
if(r > 0) {
! r = read(s, &packet, 1024);
! printf("reading (%i bytes) (%i total)...\n", r, read_offset);
! memcpy(&buffer[read_offset], packet, 1024);
! read_offset = read_offset + r;
} else {
+ memcpy(&packet_hdr, buffer, 4095);
+ read_offset = 0;
if(packet_hdr.function == 1) {
printf("%s %i\n",packet_hdr.version, sizeof(packet_hdr.version));
***************
*** 59,63 ****
}
close(s);
! close(socket);
exit(0);
// sbio=BIO_new_socket(s,BIO_NOCLOSE);
--- 65,69 ----
}
close(s);
! close(sock);
exit(0);
// sbio=BIO_new_socket(s,BIO_NOCLOSE);
|
|
From: Bob T. <bt...@us...> - 2001-08-26 20:25:17
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv29519
Modified Files:
Makefile.in aclocal.m4 config.h.in configure configure.in
Added Files:
depcomp
Log Message:
Major changes to the build environment, using the latest autoconf, automake, and libtool
--- NEW FILE: depcomp ---
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <ol...@dc...>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# `libtool' can also be set to `yes' or `no'.
depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
# here, because this file can only contain one case statement.
if test "$depmode" = hp; then
# HP compiler uses -M and no extra arg.
gccflag=-M
depmode=gcc
fi
if test "$depmode" = dashXmstdout; then
# This is just like dashmstdout with a different argument.
dashmflag=-xM
depmode=dashmstdout
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
mv "$tmpdepfile" "$depfile"
;;
gcc)
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
gccflag=-MD,
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
tr ' ' '
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
hp)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
sgi)
if test "$libtool" = yes; then
"$@" "-Wp,-MDupdate,$tmpdepfile"
else
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
# the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> $depfile
echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. This file always lives in the current directory.
# Also, the AIX compiler puts `$object:' at the start of each line;
# $object doesn't have directory information.
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
tru64)
# The Tru64 AIX compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
tmpdepfile1="$object.d"
tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
if test "$libtool" = yes; then
"$@" -Wc,-MD
else
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
test -z "$dashmflag" && dashmflag=-M
( IFS=" "
case " $* " in
*" --mode=compile "*) # this is libtool, let us make it quiet
for arg
do # cycle over the arguments
case "$arg" in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
' < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
dashXmstdout)
# This case only exists to satisfy depend.m4. It is never actually
# run, as this mode is specially recognized in the preamble.
exit 1
;;
makedepend)
# X makedepend
(
shift
cleared=no
for arg in "$@"; do
case $cleared in no)
set ""; shift
cleared=yes
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift;;
-*)
;;
*)
set fnord "$@" "$arg"; shift;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tail +3 "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
( IFS=" "
case " $* " in
*" --mode=compile "*)
for arg
do # cycle over the arguments
case $arg in
"--mode=compile")
# insert --quiet before "--mode=compile"
set fnord "$@" --quiet
shift # fnord
;;
esac
set fnord "$@" "$arg"
shift # fnord
shift # "$arg"
done
;;
esac
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
) &
proc=$!
"$@"
stat=$?
wait "$proc"
if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
none)
exec "$@"
;;
*)
echo "Unknown depmode $depmode" 1>&2
exit 1
;;
esac
exit 0
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in 2001/08/13 02:20:57 1.2
--- Makefile.in 2001/08/26 20:25:14 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,14 ****
--- 12,16 ----
# PARTICULAR PURPOSE.
+ @SET_MAKE@
SHELL = @SHELL@
***************
*** 32,42 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
--- 34,40 ----
***************
*** 47,55 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 45,53 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 60,73 ****
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
LIBTOOL = @LIBTOOL@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 58,76 ----
host_alias = @host_alias@
host_triplet = @host@
+ AMTAR = @AMTAR@
AS = @AS@
+ AWK = @AWK@
CC = @CC@
+ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 76,79 ****
--- 79,89 ----
STRIP = @STRIP@
VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
perlpath = @perlpath@
pythonpath = @pythonpath@
***************
*** 85,118 ****
SUBDIRS = src include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess config.sub \
! configure configure.in install-sh ltconfig ltmain.sh missing \
! mkinstalldirs
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
.SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
--- 95,169 ----
SUBDIRS = src include
+ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
!
! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
! uninstall-info-recursive all-recursive install-data-recursive \
! install-exec-recursive installdirs-recursive install-recursive \
! uninstall-recursive check-recursive installcheck-recursive
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 \
! config.guess config.h.in config.sub configure configure.in \
! install-sh ltconfig ltmain.sh missing mkinstalldirs
! DIST_SUBDIRS = $(SUBDIRS)
! all: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
! distclean-libtool:
! -rm -f libtool
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && \
! CONFIG_HEADERS= CONFIG_LINKS= \
! CONFIG_FILES=$@ $(SHELL) ./config.status
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ config.h: stamp-h
+ @if test ! -f $@; then \
+ rm -f stamp-h; \
+ $(MAKE) stamp-h; \
+ else :; fi
+ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h stamp-hT
+ @echo timestamp > stamp-hT 2> /dev/null
+ cd $(top_builddir) \
+ && CONFIG_FILES= CONFIG_HEADERS=config.h \
+ $(SHELL) ./config.status
+ @mv stamp-hT stamp-h
+ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/./stamp-h.in
+ @if test ! -f $@; then \
+ rm -f $(srcdir)/./stamp-h.in; \
+ $(MAKE) $(srcdir)/./stamp-h.in; \
+ else :; fi
+ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
+ @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
+
+ distclean-hdr:
+ -rm -f config.h
+ uninstall-info-am:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
***************
*** 121,130 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
--- 172,176 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
***************
*** 149,157 ****
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 195,208 ----
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 172,258 ****
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
distdir: $(DISTFILES)
! -rm -rf $(distdir)
mkdir $(distdir)
- -chmod 777 $(distdir)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
--- 223,285 ----
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ top_distdir = .
+ # Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION)
! GZIP_ENV = --best
!
distdir: $(DISTFILES)
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
***************
*** 262,297 ****
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! install-exec-am:
! install-exec: install-exec-recursive
! install-data-am:
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
- uninstall-am:
- uninstall: uninstall-recursive
- all-am: Makefile
- all-redirect: all-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
-
mostlyclean-generic:
--- 289,359 ----
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || (echo "Error: files left after uninstall" 1>&2; \
! exit 1) ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist \
! && $(MAKE) $(AM_MAKEFLAGS) distclean \
! && rm -f $(distdir).tar.gz \
! && (test `find . -type f -print | wc -l` -eq 0 \
! || (echo "Error: files left after distclean" 1>&2; \
! exit 1) )
! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
! all-am: Makefile config.h
! installdirs: installdirs-recursive
! installdirs-am:
! install: install-recursive
! install-exec: install-exec-recursive
install-data: install-data-recursive
+ uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 299,341 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-tags clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-tags distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-recursive
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
! .PHONY: install-data-recursive uninstall-data-recursive \
! install-exec-recursive uninstall-exec-recursive installdirs-recursive \
! uninstalldirs-recursive all-recursive check-recursive \
! installcheck-recursive info-recursive dvi-recursive \
! mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs-am \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 361,426 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-generic clean-libtool mostlyclean-am
! dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
! distclean: distclean-recursive
! -rm -f config.status config.cache config.log
! distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
! distclean-tags
! dvi: dvi-recursive
! dvi-am:
! info: info-recursive
! info-am:
+ install-data-am:
+
+ install-exec-am:
+
+ install-info: install-info-recursive
+
+ install-man:
+
+ installcheck-am:
+
maintainer-clean: maintainer-clean-recursive
!
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-recursive
!
! mostlyclean-am: mostlyclean-generic mostlyclean-libtool
!
! uninstall-am: uninstall-info-am
! uninstall-info: uninstall-info-recursive
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive dist dist-all \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am dvi-recursive info info-am info-recursive install \
+ install-am install-data install-data-am install-data-recursive \
+ install-exec install-exec-am install-exec-recursive \
+ install-info install-info-am install-info-recursive install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson3/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** aclocal.m4 2001/08/13 02:20:57 1.4
--- aclocal.m4 2001/08/26 20:25:14 1.5
***************
*** 1,13 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
k
--- 1,14 ----
! # aclocal.m4 generated automatically by aclocal 1.5
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
k
***************
*** 17,58 ****
# But this isn't really a big deal.
! # serial 1
!
! dnl Usage:
! dnl AM_INIT_AUTOMAKE(package,version, [no-define])
! AC_DEFUN(AM_INIT_AUTOMAKE,
! [AC_REQUIRE([AC_PROG_INSTALL])
! PACKAGE=[$1]
! AC_SUBST(PACKAGE)
! VERSION=[$2]
! AC_SUBST(VERSION)
! dnl test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
! AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
! fi
ifelse([$3],,
! AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
! AC_REQUIRE([AM_SANITY_CHECK])
! AC_REQUIRE([AC_ARG_PROGRAM])
! dnl FIXME This is truly gross.
! missing_dir=`cd $ac_aux_dir && pwd`
! AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
! AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
! AC_REQUIRE([AC_PROG_MAKE_SET])])
#
# Check to make sure that the build environment is sane.
#
! AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
--- 18,120 ----
# But this isn't really a big deal.
! # serial 5
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery. Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
!
!
! # We require 2.13 because we rely on SHELL being computed by configure.
! AC_PREREQ([2.13])
!
! # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
! # -----------------------------------------------------------
! # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
! # The purpose of this macro is to provide the user with a means to
! # check macros which are provided without letting her know how the
! # information is coded.
! # If this macro is not defined by Autoconf, define it here.
! ifdef([AC_PROVIDE_IFELSE],
! [],
! [define([AC_PROVIDE_IFELSE],
! [ifdef([AC_PROVIDE_$1],
! [$2], [$3])])])
!
!
! # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
! # ----------------------------------------------
! AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AC_PROG_INSTALL])dnl
! # test to see if srcdir already configured
! if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
! test -f $srcdir/config.status; then
! AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
! fi
!
! # Define the identity of the package.
! PACKAGE=$1
! AC_SUBST(PACKAGE)dnl
! VERSION=$2
! AC_SUBST(VERSION)dnl
ifelse([$3],,
! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
!
! # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
! # the ones we care about.
! ifdef([m4_pattern_allow],
! [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
!
! # Autoconf 2.50 always computes EXEEXT. However we need to be
! # compatible with 2.13, for now. So we always define EXEEXT, but we
! # don't compute it.
! AC_SUBST(EXEEXT)
! # Similar for OBJEXT -- only we only use OBJEXT if the user actually
! # requests that it be used. This is a bit dumb.
! : ${OBJEXT=o}
! AC_SUBST(OBJEXT)
!
! # Some tools Automake needs.
! AC_REQUIRE([AM_SANITY_CHECK])dnl
! AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal)
! AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake)
! AM_MISSING_PROG(AUTOHEADER, autoheader)
! AM_MISSING_PROG(MAKEINFO, makeinfo)
! AM_MISSING_PROG(AMTAR, tar)
! AM_PROG_INSTALL_SH
! AM_PROG_INSTALL_STRIP
! # We need awk for the "check" target. The system "awk" is bad on
! # some platforms.
! AC_REQUIRE([AC_PROG_AWK])dnl
! AC_REQUIRE([AC_PROG_MAKE_SET])dnl
! AC_REQUIRE([AM_DEP_TRACK])dnl
! AC_REQUIRE([AM_SET_DEPDIR])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CC],
! [_AM_DEPENDENCIES(CC)],
! [define([AC_PROG_][CC],
! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CXX],
! [_AM_DEPENDENCIES(CXX)],
! [define([AC_PROG_][CXX],
! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
! ])
#
# Check to make sure that the build environment is sane.
#
+
+ # serial 3
! # AM_SANITY_CHECK
! # ---------------
! AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
***************
*** 61,71 ****
# directory).
if (
! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
! if test "[$]*" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftestfile`
fi
! if test "[$]*" != "X $srcdir/configure conftestfile" \
! && test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
--- 123,134 ----
# directory).
if (
! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
! if test "$[*]" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftest.file`
fi
! rm -f conftest.file
! if test "$[*]" != "X $srcdir/configure conftest.file" \
! && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
***************
*** 77,81 ****
fi
! test "[$]2" = conftestfile
)
then
--- 140,144 ----
fi
! test "$[2]" = conftest.file
)
then
***************
*** 86,108 ****
Check your system clock])
fi
- rm -f conftest*
AC_MSG_RESULT(yes)])
! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
! dnl The program must properly implement --version.
! AC_DEFUN(AM_MISSING_PROG,
! [AC_MSG_CHECKING(for working $2)
! # Run test in a subshell; some versions of sh will print an error if
! # an executable is not found, even if stderr is redirected.
! # Redirect stdin to placate older versions of autoconf. Sigh.
! if ($2 --version) < /dev/null > /dev/null 2>&1; then
! $1=$2
! AC_MSG_RESULT(found)
else
! $1="$3/missing $2"
! AC_MSG_RESULT(missing)
fi
! AC_SUBST($1)])
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
--- 149,517 ----
Check your system clock])
fi
AC_MSG_RESULT(yes)])
+
+
+ # serial 2
! # AM_MISSING_PROG(NAME, PROGRAM)
! # ------------------------------
! AC_DEFUN([AM_MISSING_PROG],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])
! $1=${$1-"${am_missing_run}$2"}
! AC_SUBST($1)])
!
!
! # AM_MISSING_HAS_RUN
! # ------------------
! # Define MISSING if not defined so far and test if it supports --run.
! # If it does, set am_missing_run to use it, otherwise, to nothing.
! AC_DEFUN([AM_MISSING_HAS_RUN],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
! # Use eval to expand $SHELL
! if eval "$MISSING --run true"; then
! am_missing_run="$MISSING --run "
! else
! am_missing_run=
! am_backtick='`'
! AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
! fi
! ])
!
! # AM_AUX_DIR_EXPAND
!
! # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
! # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
! # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
! #
! # Of course, Automake must honor this variable whenever it calls a
! # tool from the auxiliary directory. The problem is that $srcdir (and
! # therefore $ac_aux_dir as well) can be either absolute or relative,
! # depending on how configure is run. This is pretty annoying, since
! # it makes $ac_aux_dir quite unusable in subdirectories: in the top
! # source directory, any form will work fine, but in subdirectories a
! # relative path needs to be adjusted first.
! #
! # $ac_aux_dir/missing
! # fails when called from a subdirectory if $ac_aux_dir is relative
! # $top_srcdir/$ac_aux_dir/missing
! # fails if $ac_aux_dir is absolute,
! # fails when called from a subdirectory in a VPATH build with
! # a relative $ac_aux_dir
! #
! # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
! # are both prefixed by $srcdir. In an in-source build this is usually
! # harmless because $srcdir is `.', but things will broke when you
! # start a VPATH build or use an absolute $srcdir.
! #
! # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
! # iff we strip the leading $srcdir from $ac_aux_dir. That would be:
! # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
! # and then we would define $MISSING as
! # MISSING="\${SHELL} $am_aux_dir/missing"
! # This will work as long as MISSING is not called from configure, because
! # unfortunately $(top_srcdir) has no meaning in configure.
! # However there are other variables, like CC, which are often used in
! # configure, and could therefore not use this "fixed" $ac_aux_dir.
! #
! # Another solution, used here, is to always expand $ac_aux_dir to an
! # absolute PATH. The drawback is that using absolute paths prevent a
! # configured tree to be moved without reconfiguration.
!
! AC_DEFUN([AM_AUX_DIR_EXPAND], [
! # expand $ac_aux_dir to an absolute path
! am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
! ])
!
! # AM_PROG_INSTALL_SH
! # ------------------
! # Define $install_sh.
! AC_DEFUN([AM_PROG_INSTALL_SH],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! install_sh=${install_sh-"$am_aux_dir/install-sh"}
! AC_SUBST(install_sh)])
!
! # One issue with vendor `install' (even GNU) is that you can't
! # specify the program used to strip binaries. This is especially
! # annoying in cross-compiling environments, where the build's strip
! # is unlikely to handle the host's binaries.
! # Fortunately install-sh will honor a STRIPPROG variable, so we
! # always use install-sh in `make install-strip', and initialize
! # STRIPPROG with the value of the STRIP variable (set by the user).
! AC_DEFUN([AM_PROG_INSTALL_STRIP],
! [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
! AC_SUBST([INSTALL_STRIP_PROGRAM])])
!
! # serial 4 -*- Autoconf -*-
!
!
!
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery. Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
!
!
!
! # _AM_DEPENDENCIES(NAME)
! # ---------------------
! # See how the compiler implements dependency checking.
! # NAME is "CC", "CXX" or "OBJC".
! # We try a few techniques and use that to set a single cache variable.
! #
! # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
! # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
! # dependency, and given that the user is not expected to run this macro,
! # just rely on AC_PROG_CC.
! AC_DEFUN([_AM_DEPENDENCIES],
! [AC_REQUIRE([AM_SET_DEPDIR])dnl
! AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
! AC_REQUIRE([AM_MAKE_INCLUDE])dnl
! AC_REQUIRE([AM_DEP_TRACK])dnl
!
! ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
! [$1], CXX, [depcc="$CXX" am_compiler_list=],
! [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
! [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
! [depcc="$$1" am_compiler_list=])
!
! AC_CACHE_CHECK([dependency style of $depcc],
! [am_cv_$1_dependencies_compiler_type],
! [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
! # We make a subdir and do the tests there. Otherwise we can end up
! # making bogus files that we don't know about and never remove. For
! # instance it was reported that on HP-UX the gcc test will end up
! # making a dummy file named `D' -- because `-MD' means `put the output
! # in D'.
! mkdir conftest.dir
! # Copy depcomp to subdir because otherwise we won't find it if we're
! # using a relative directory.
! cp "$am_depcomp" conftest.dir
! cd conftest.dir
!
! am_cv_$1_dependencies_compiler_type=none
! if test "$am_compiler_list" = ""; then
! am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
! fi
! for depmode in $am_compiler_list; do
! # We need to recreate these files for each test, as the compiler may
! # overwrite some of them when testing with obscure command lines.
! # This happens at least with the AIX C compiler.
! echo '#include "conftest.h"' > conftest.c
! echo 'int i;' > conftest.h
! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
!
! case $depmode in
! nosideeffect)
! # after this tag, mechanisms are not by side-effect, so they'll
! # only be used when explicitly requested
! if test "x$enable_dependency_tracking" = xyes; then
! continue
! else
! break
! fi
! ;;
! none) break ;;
! esac
! # We check with `-c' and `-o' for the sake of the "dashmstdout"
! # mode. It turns out that the SunPro C++ compiler does not properly
! # handle `-M -o', and we need to detect this.
! if depmode=$depmode \
! source=conftest.c object=conftest.o \
! depfile=conftest.Po tmpdepfile=conftest.TPo \
! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
! grep conftest.h conftest.Po > /dev/null 2>&1 &&
! ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
! am_cv_$1_dependencies_compiler_type=$depmode
! break
! fi
! done
!
! cd ..
! rm -rf conftest.dir
else
! am_cv_$1_dependencies_compiler_type=none
fi
! ])
! $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
! AC_SUBST([$1DEPMODE])
! ])
!
!
! # AM_SET_DEPDIR
! # -------------
! # Choose a directory name for dependency files.
! # This macro is AC_REQUIREd in _AM_DEPENDENCIES
! AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
! DEPDIR=.deps
! else
! # MS-DOS does not allow filenames that begin with a dot.
! DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST(DEPDIR)
! ])
!
!
! # AM_DEP_TRACK
! # ------------
! AC_DEFUN([AM_DEP_TRACK],
! [AC_ARG_ENABLE(dependency-tracking,
! [ --disable-dependency-tracking Speeds up one-time builds
! --enable-dependency-tracking Do not reject slow dependency extractors])
! if test "x$enable_dependency_tracking" != xno; then
! am_depcomp="$ac_aux_dir/depcomp"
! AMDEPBACKSLASH='\'
! fi
! AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
! pushdef([subst], defn([AC_SUBST]))
! subst(AMDEPBACKSLASH)
! popdef([subst])
! ])
!
! # Generate code to set up dependency tracking.
! # This macro should only be invoked once -- use via AC_REQUIRE.
! # Usage:
! # AM_OUTPUT_DEPENDENCY_COMMANDS
!
! #
! # This code is only required when automatic dependency tracking
! # is enabled. FIXME. This creates each `.P' file that we will
! # need in order to bootstrap the dependency handling code.
! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
! AC_OUTPUT_COMMANDS([
! test x"$AMDEP_TRUE" != x"" ||
! for mf in $CONFIG_FILES; do
! case "$mf" in
! Makefile) dirpart=.;;
! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
! *) continue;;
! esac
! grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
! # Extract the definition of DEP_FILES from the Makefile without
! # running `make'.
! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
! test -z "$DEPDIR" && continue
! # When using ansi2knr, U may be empty or an underscore; expand it
! U=`sed -n -e '/^U = / s///p' < "$mf"`
! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
! # We invoke sed twice because it is the simplest approach to
! # changing $(DEPDIR) to its actual value in the expansion.
! for file in `sed -n -e '
! /^DEP_FILES = .*\\\\$/ {
! s/^DEP_FILES = //
! :loop
! s/\\\\$//
! p
! n
! /\\\\$/ b loop
! p
! }
! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
! # Make sure the directory exists.
! test -f "$dirpart/$file" && continue
! fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
! $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
! # echo "creating $dirpart/$file"
! echo '# dummy' > "$dirpart/$file"
! done
! done
! ], [AMDEP_TRUE="$AMDEP_TRUE"
! ac_aux_dir="$ac_aux_dir"])])
!
! # AM_MAKE_INCLUDE()
! # -----------------
! # Check to see how make treats includes.
! AC_DEFUN([AM_MAKE_INCLUDE],
! [am_make=${MAKE-make}
! cat > confinc << 'END'
! doit:
! @echo done
! END
! # If we don't find an include directive, just comment out the code.
! AC_MSG_CHECKING([for style of include used by $am_make])
! am__include='#'
! am__quote=
! _am_result=none
! # First try GNU make style include.
! echo "include confinc" > confmf
! # We grep out `Entering directory' and `Leaving directory'
! # messages which can occur if `w' ends up in MAKEFLAGS.
! # In particular we don't look at `^make:' because GNU make might
! # be invoked under some other name (usually "gmake"), in which
! # case it prints its new name instead of `make'.
! if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
! am__include=include
! am__quote=
! _am_result=GNU
! fi
! # Now try BSD make style include.
! if test "$am__include" = "#"; then
! echo '.include "confinc"' > confmf
! if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
! am__include=.include
! am__quote='"'
! _am_result=BSD
! fi
! fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
! rm -f confinc confmf
! ])
!
! # serial 3
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+ # Define a conditional.
+ #
+ # FIXME: Once using 2.50, use this:
+ # m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+ AC_DEFUN([AM_CONDITIONAL],
+ [ifelse([$1], [TRUE],
+ [errprint(__file__:__line__: [$0: invalid condition: $1
+ ])dnl
+ m4exit(1)])dnl
+ ifelse([$1], [FALSE],
+ [errprint(__file__:__line__: [$0: invalid condition: $1
+ ])dnl
+ m4exit(1)])dnl
+ AC_SUBST([$1_TRUE])
+ AC_SUBST([$1_FALSE])
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+ else
+ $1_TRUE='#'
+ $1_FALSE=
+ fi])
+
+ # Add --enable-maintainer-mode option to configure.
+ # From Jim Meyering
+
+ # serial 1
+
+ AC_DEFUN([AM_MAINTAINER_MODE],
+ [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+ [ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+ ]
+ )
+
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
***************
*** 3428,3430 ****
--- 3837,3906 ----
# This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])
+
+ # Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+ # serial 3
+
+ # When config.status generates a header, we must update the stamp-h file.
+ # This file resides in the same directory as the config header
+ # that is generated. We must strip everything past the first ":",
+ # and everything past the last "/".
+
+ AC_PREREQ([2.12])
+
+ AC_DEFUN([AM_CONFIG_HEADER],
+ [ifdef([AC_FOREACH],dnl
+ [dnl init our file count if it isn't already
+ m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+ dnl prepare to store our destination file list for use in config.status
+ AC_FOREACH([_AM_File], [$1],
+ [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+ m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
+ dnl and add it to the list of files AC keeps track of, along
+ dnl with our hook
+ AC_CONFIG_HEADERS(_AM_File,
+ dnl COMMANDS, [, INIT-CMDS]
+ [# update the timestamp
+ echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+ ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
+ m4_popdef([_AM_Dest])])],dnl
+ [AC_CONFIG_HEADER([$1])
+ AC_OUTPUT_COMMANDS(
+ ifelse(patsubst([$1], [[^ ]], []),
+ [],
+ [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+ patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
+ [am_indx=1
+ for am_file in $1; do
+ case " \$CONFIG_HEADERS " in
+ *" \$am_file "*)
+ am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
+ if test -n "\$am_dir"; then
+ am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
+ for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
+ am_tmpdir=\$am_tmpdir\$am_subdir/
+ if test ! -d \$am_tmpdir; then
+ mkdir \$am_tmpdir
+ fi
+ done
+ fi
+ echo timestamp > "\$am_dir"stamp-h\$am_indx
+ ;;
+ esac
+ am_indx=\`expr \$am_indx + 1\`
+ done])
+ ])]) # AM_CONFIG_HEADER
+
+ # _AM_DIRNAME(PATH)
+ # -----------------
+ # Like AS_DIRNAME, only do it during macro expansion
+ AC_DEFUN([_AM_DIRNAME],
+ [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+ m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+ m4_if(m4_regexp([$1], [^/.*]), -1,
+ [.],
+ m4_patsubst([$1], [^\(/\).*], [\1])),
+ m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+ m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+ ]) # _AM_DIRNAME
Index: config.h.in
===================================================================
RCS file: /cvsroot/benson/benson3/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config.h.in 2001/08/21 02:47:14 1.2
--- config.h.in 2001/08/26 20:25:14 1.3
***************
*** 57,58 ****
--- 57,65 ----
/* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
+
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+
+ /* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
+ #undef inline
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** configure 2001/08/22 20:09:08 1.9
--- configure 2001/08/26 20:25:14 1.10
***************
*** 797,800 ****
--- 797,804 ----
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--enable-shared=PKGS build shared libraries default=yes
--enable-static=PKGS build static libraries default=yes
***************
[...6671 lines suppressed...]
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
+ $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+ ;;
+ esac
done
EOF
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** configure.in 2001/08/22 20:09:08 1.9
--- configure.in 2001/08/26 20:25:14 1.10
***************
*** 4,12 ****
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
AC_CANONICAL_HOST
AC_PROG_CC
! AC_PROG_INSTALL
AM_PROG_LIBTOOL
! AC_CONFIG_HEADERS(config.h)
MAJOR_VERSION=3
--- 4,18 ----
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
+ AM_MAINTAINER_MODE
AC_CANONICAL_HOST
AC_PROG_CC
! AC_C_CONST
! AC_C_INLINE
! #AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
! AC_SUBST(LIBTOOL_DEPS)
! AC_PROG_INSTALL
! AM_CONFIG_HEADER(config.h)
! #AC_CONFIG_HEADERS(config.h)
MAJOR_VERSION=3
|
|
From: Bob T. <bt...@us...> - 2001-08-26 20:25:17
|
Update of /cvsroot/benson/benson3/include
In directory usw-pr-cvs1:/tmp/cvs-serv29519/include
Modified Files:
Makefile.in
Log Message:
Major changes to the build environment, using the latest autoconf, automake, and libtool
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/include/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in 2001/08/21 03:52:02 1.2
--- Makefile.in 2001/08/26 20:25:14 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,14 ****
--- 12,16 ----
# PARTICULAR PURPOSE.
+ @SET_MAKE@
SHELL = @SHELL@
***************
*** 32,42 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
--- 34,40 ----
***************
*** 47,55 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 45,53 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 60,73 ****
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
LIBTOOL = @LIBTOOL@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 58,76 ----
host_alias = @host_alias@
host_triplet = @host@
+ AMTAR = @AMTAR@
AS = @AS@
+ AWK = @AWK@
CC = @CC@
+ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 76,79 ****
--- 79,89 ----
STRIP = @STRIP@
VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
perlpath = @perlpath@
pythonpath = @pythonpath@
***************
*** 85,200 ****
include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h benson/perl_util.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! HEADERS = $(include_HEADERS)
!
! DIST_COMMON = Makefile.am Makefile.in
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
.SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
! list='$(include_HEADERS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(includedir)/$$p; \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = include
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-exec-local
! install-exec: install-exec-am
! install-data-am: install-includeHEADERS
! install-data: install-data-am
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-includeHEADERS
uninstall: uninstall-am
- all-am: Makefile $(HEADERS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(includedir)
mostlyclean-generic:
--- 95,218 ----
include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h benson/perl_util.h
+ subdir = include
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
! HEADERS = $(include_HEADERS)
+ DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
+ all: all-am
.SUFFIXES:
! mostlyclean-libtool:
! -rm -f *.lo
+ clean-libtool:
+ -rm -rf .libs _libs
+ distclean-libtool:
+ -rm -f libtool
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu include/Makefile
+ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+ uninstall-info-am:
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
! @list='$(include_HEADERS)'; for p in $$list; do \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
! rm -f $(DESTDIR)$(includedir)/$$f; \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! $(mkinstalldirs) $(distdir)/benson
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(HEADERS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(includedir)
install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
uninstall: uninstall-am
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 202,239 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-tags clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-tags distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: uninstall-includeHEADERS install-includeHEADERS tags \
! mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
! distdir info-am info dvi-am dvi check check-am installcheck-am \
! installcheck install-exec-local install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
install-exec-local:
# automake won't make the benson directory in prefix/include/
--- 220,277 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-generic clean-libtool mostlyclean-am
! distclean: distclean-am
! distclean-am: clean-am distclean-generic distclean-libtool \
! distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
+ info-am:
+
+ install-data-am: install-includeHEADERS
+
+ install-exec-am: install-exec-local
+
+ install-info: install-info-am
+
+ install-man:
+
+ installcheck-am:
+
maintainer-clean: maintainer-clean-am
+
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
! uninstall-am: uninstall-includeHEADERS uninstall-info-am
+ .PHONY: GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool distclean distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-exec-local install-includeHEADERS \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool tags uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-info-am
+
install-exec-local:
# automake won't make the benson directory in prefix/include/
***************
*** 241,245 ****
$(mkinstalldirs) $(DESTDIR)$(includedir)/benson; \
$(mkinstalldirs) $(DESTDIR)$(includedir);
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 279,282 ----
|
|
From: Bob T. <bt...@us...> - 2001-08-26 20:25:17
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv29519/src
Modified Files:
Makefile.in
Log Message:
Major changes to the build environment, using the latest autoconf, automake, and libtool
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Makefile.in 2001/08/23 04:49:57 1.8
--- Makefile.in 2001/08/26 20:25:15 1.9
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,14 ****
--- 12,16 ----
# PARTICULAR PURPOSE.
+ @SET_MAKE@
SHELL = @SHELL@
***************
*** 32,42 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
--- 34,40 ----
***************
*** 47,55 ****
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 45,53 ----
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 60,73 ****
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
LIBTOOL = @LIBTOOL@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
--- 58,76 ----
host_alias = @host_alias@
host_triplet = @host@
+ AMTAR = @AMTAR@
AS = @AS@
+ AWK = @AWK@
CC = @CC@
+ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
! MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
***************
*** 76,79 ****
--- 79,89 ----
STRIP = @STRIP@
VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
perlpath = @perlpath@
pythonpath = @pythonpath@
***************
*** 95,160 ****
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
SUBDIRS =
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
!
! DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! X_CFLAGS = @X_CFLAGS@
! X_LIBS = @X_LIBS@
! X_EXTRA_LIBS = @X_EXTRA_LIBS@
! X_PRE_LIBS = @X_PRE_LIBS@
! libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
! bin_PROGRAMS = btrap$(EXEEXT)
! sbin_PROGRAMS = bensond$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
!
! btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_DEPENDENCIES = libbenson.la
! btrap_LDFLAGS =
! bensond_OBJECTS = bensond.$(OBJEXT)
! bensond_DEPENDENCIES = libbenson.la
! bensond_LDFLAGS =
! CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/bensond.P .deps/btrap.P .deps/network.P \
! .deps/shm_wrapper.P .deps/ssl.P
! SOURCES = $(libbenson_la_SOURCES) $(btrap_SOURCES) $(bensond_SOURCES)
! OBJECTS = $(libbenson_la_OBJECTS) $(btrap_OBJECTS) $(bensond_OBJECTS)
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .lo .o .obj .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-libLTLIBRARIES:
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
!
! distclean-libLTLIBRARIES:
! maintainer-clean-libLTLIBRARIES:
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- 105,178 ----
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
SUBDIRS =
+ subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
!
! libbenson_la_LIBADD =
! am_libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
! libbenson_la_OBJECTS = $(am_libbenson_la_OBJECTS)
! bin_PROGRAMS = btrap$(EXEEXT)
! sbin_PROGRAMS = bensond$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
!
! am_bensond_OBJECTS = bensond.$(OBJEXT)
! bensond_OBJECTS = $(am_bensond_OBJECTS)
! bensond_DEPENDENCIES = libbenson.la
! bensond_LDFLAGS =
! am_btrap_OBJECTS = btrap.$(OBJEXT)
! btrap_OBJECTS = $(am_btrap_OBJECTS)
! btrap_DEPENDENCIES = libbenson.la
! btrap_LDFLAGS =
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bensond.Po $(DEPDIR)/btrap.Po \
! @AMDEP_TRUE@ $(DEPDIR)/network.Plo $(DEPDIR)/shm_wrapper.Plo \
! @AMDEP_TRUE@ $(DEPDIR)/ssl.Plo
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
! CFLAGS = @CFLAGS@
! DIST_SOURCES = $(libbenson_la_SOURCES) $(bensond_SOURCES) \
! $(btrap_SOURCES)
! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
! uninstall-info-recursive all-recursive install-data-recursive \
! install-exec-recursive installdirs-recursive install-recursive \
! uninstall-recursive check-recursive installcheck-recursive
! DIST_COMMON = Makefile.am Makefile.in
! DIST_SUBDIRS = $(SUBDIRS)
! SOURCES = $(libbenson_la_SOURCES) $(bensond_SOURCES) $(btrap_SOURCES)
! all: all-recursive
.SUFFIXES:
! .SUFFIXES: .c .lo .o .obj
! mostlyclean-libtool:
! -rm -f *.lo
! clean-libtool:
! -rm -rf .libs _libs
+ distclean-libtool:
+ -rm -f libtool
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/Makefile
+ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && \
+ CONFIG_HEADERS= CONFIG_LINKS= \
+ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
***************
*** 162,167 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
--- 180,185 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
***************
*** 169,233 ****
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! $(COMPILE) -c `cygpath -w $<`
!
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
!
! mostlyclean-compile:
! -rm -f *.o core *.core
! -rm -f *.$(OBJEXT)
!
! clean-compile:
!
! distclean-compile:
! -rm -f *.tab.c
!
! maintainer-clean-compile:
!
! .s.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
!
! .S.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
!
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
!
! maintainer-clean-libtool:
!
! libbenson.la: $(libbenson_la_OBJECTS) $(libbenson_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libbenson_la_LDFLAGS) $(libbenson_la_OBJECTS) $(libbenson_la_LIBADD) $(LIBS)
-
- mostlyclean-binPROGRAMS:
-
- clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
- distclean-binPROGRAMS:
-
- maintainer-clean-binPROGRAMS:
-
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 187,210 ----
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! libbenson.la: $(libbenson_la_OBJECTS) $(libbenson_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libbenson_la_LDFLAGS) $(libbenson_la_OBJECTS) $(libbenson_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! || test -f $$p1 \
! ; then \
! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
***************
*** 235,258 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
-
- mostlyclean-sbinPROGRAMS:
-
- clean-sbinPROGRAMS:
- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
-
- distclean-sbinPROGRAMS:
-
- maintainer-clean-sbinPROGRAMS:
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 212,234 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! || test -f $$p1 \
! ; then \
! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
else :; fi; \
done
***************
*** 260,275 ****
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(sbin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! btrap$(EXEEXT): $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
@rm -f btrap$(EXEEXT)
$(LINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
! bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! @rm -f bensond$(EXEEXT)
! $(LINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
--- 236,289 ----
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(sbin_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
! rm -f $(DESTDIR)$(sbindir)/$$f; \
done
! clean-sbinPROGRAMS:
! -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
! bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
! @rm -f bensond$(EXEEXT)
! $(LINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
! btrap$(EXEEXT): $(btrap_OBJECTS) $(btrap_DEPENDENCIES)
@rm -f btrap$(EXEEXT)
$(LINK) $(btrap_LDFLAGS) $(btrap_OBJECTS) $(btrap_LDADD) $(LIBS)
! mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
!
! distclean-compile:
! -rm -f *.tab.c
!
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bensond.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/btrap.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/network.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shm_wrapper.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ssl.Plo@am__quote@
!
! distclean-depend:
! -rm -rf $(DEPDIR)
!
! .c.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
!
! .c.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(COMPILE) -c `cygpath -w $<`
+ .c.lo:
+ @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+ CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
***************
*** 278,287 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
--- 292,296 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
***************
*** 306,314 ****
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 315,328 ----
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 329,382 ****
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = src
distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
@for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
--- 343,400 ----
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
! GTAGS:
! here=`CDPATH=: && cd $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
! if test -f $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! $(mkinstalldirs) "$(distdir)/$$dir"; \
! fi; \
if test -d $$d/$$file; then \
! cp -pR $$d/$$file $(distdir) \
! || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
***************
*** 386,457 ****
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-recursive
- dvi-am:
- dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
! install-sbinPROGRAMS
! install-exec: install-exec-recursive
! install-data-am:
! install-data: install-data-recursive
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-recursive
! uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
! uninstall-sbinPROGRAMS
uninstall: uninstall-recursive
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
- all-redirect: all-recursive
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(sbindir)
mostlyclean-generic:
--- 404,437 ----
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-recursive
! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
! install-binPROGRAMS: install-libLTLIBRARIES
! installdirs: installdirs-recursive
! installdirs-am:
! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
install: install-recursive
! install-exec: install-exec-recursive
! install-data: install-data-recursive
uninstall: uninstall-recursive
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 459,522 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-binPROGRAMS \
! mostlyclean-sbinPROGRAMS mostlyclean-tags \
! mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
! clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \
! clean-depend clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-libLTLIBRARIES distclean-compile \
! distclean-libtool distclean-binPROGRAMS \
! distclean-sbinPROGRAMS distclean-tags distclean-depend \
! distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-recursive
! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
! maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-binPROGRAMS \
! maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
! distclean-compile clean-compile maintainer-clean-compile \
! mostlyclean-libtool distclean-libtool clean-libtool \
! maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
! clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
! install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
! clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
! install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \
! install-exec-recursive uninstall-exec-recursive installdirs-recursive \
! uninstalldirs-recursive all-recursive check-recursive \
! installcheck-recursive info-recursive dvi-recursive \
! mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 439,509 ----
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
! clean-libtool clean-sbinPROGRAMS mostlyclean-am
! distclean: distclean-recursive
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags
! dvi: dvi-recursive
! dvi-am:
! info: info-recursive
!
! info-am:
!
! install-data-am:
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
+ install-sbinPROGRAMS
+
+ install-info: install-info-recursive
+
+ install-man:
+
+ installcheck-am:
+
maintainer-clean: maintainer-clean-recursive
+
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
! uninstall-info: uninstall-info-recursive
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool clean-recursive clean-sbinPROGRAMS distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am dvi-recursive info info-am info-recursive install \
+ install-am install-binPROGRAMS install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-libLTLIBRARIES install-man \
+ install-recursive install-sbinPROGRAMS install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ installdirs-recursive maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-info-recursive uninstall-libLTLIBRARIES \
+ uninstall-recursive uninstall-sbinPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
From: Bob T. <bt...@us...> - 2001-08-26 20:16:38
|
Update of /cvsroot/benson/benson3/include/benson
In directory usw-pr-cvs1:/tmp/cvs-serv27713/include/benson
Modified Files:
network.h
Log Message:
The latest networking code
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/network.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** network.h 2001/08/23 04:49:57 1.3
--- network.h 2001/08/26 20:16:34 1.4
***************
*** 10,19 ****
struct benson_trap {
! char agent[256];
! char destination[256];
! char severity[256];
! char subsystem[256];
! char message[1024];
};
int bn_tcp_connect(char *forwarder);
--- 10,39 ----
struct benson_trap {
! unsigned char severity[256];
! unsigned char subsystem[256];
! unsigned char message[1024];
};
+
+ struct benson_acknowledge {
+ unsigned char identity[256];
+ };
+
+ struct benson_alertlist {
+ unsigned int max_num_alerts;
+ };
+
+ struct benson_header {
+ unsigned char benson[7];
+ unsigned char version[32];
+ unsigned int function;
+ unsigned char destination[256];
+ unsigned char agent[256];
+ union {
+ struct benson_trap trap;
+ struct benson_acknowledge acknowledge;
+ struct benson_alertlist alertlist;
+ } data;
+ };
+
int bn_tcp_connect(char *forwarder);
|
