From 940df689f55598305b02dd399cb98344beb01fb8 Mon Sep 17 00:00:00 2001 From: Stephane Bortzmeyer Date: Mon, 17 Apr 2000 14:43:43 +0000 Subject: [PATCH] T/TCP now correct --- SRC/Makefile.am | 4 +-- SRC/Makefile.in | 66 +++++++++++------------------------------------- SRC/configure | 7 ++--- SRC/configure.in | 7 ++--- 4 files changed, 25 insertions(+), 59 deletions(-) diff --git a/SRC/Makefile.am b/SRC/Makefile.am index e914259..a5ace61 100644 --- a/SRC/Makefile.am +++ b/SRC/Makefile.am @@ -4,5 +4,5 @@ bin_PROGRAMS = echoping echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h echoping_LDADD = - - +# Otherwise, we depend on GNUmake +#AUTOMAKE_OPTIONS = no-dependencies \ No newline at end of file diff --git a/SRC/Makefile.in b/SRC/Makefile.in index 64f0464..8b402c2 100644 --- a/SRC/Makefile.in +++ b/SRC/Makefile.in @@ -67,6 +67,9 @@ VERSION = @VERSION@ bin_PROGRAMS = echoping echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h echoping_LDADD = + +# Otherwise, we depend on GNUmake +AUTOMAKE_OPTIONS = no-dependencies ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -95,8 +98,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/HTParse.P .deps/echoping.P .deps/error.P .deps/http.P \ -.deps/icp.P .deps/readline.P .deps/util.P .deps/writen.P SOURCES = $(echoping_SOURCES) OBJECTS = $(echoping_OBJECTS) @@ -106,7 +107,7 @@ all: all-redirect $(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) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -171,6 +172,9 @@ uninstall-binPROGRAMS: rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done +.c.o: + $(COMPILE) -c $< + .s.o: $(COMPILE) -c $< @@ -258,11 +262,6 @@ 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 \ @@ -273,38 +272,6 @@ distdir: $(DISTFILES) || 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: @@ -345,27 +312,25 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags mostlyclean-depend \ + mostlyclean-compile mostlyclean-tags \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-depend clean-generic mostlyclean-am + clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-depend distclean-generic \ - clean-am + distclean-tags distclean-generic clean-am distclean: distclean-am -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-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." @@ -377,11 +342,10 @@ mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile 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 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 \ +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 \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/SRC/configure b/SRC/configure index 9a90283..d61da97 100755 --- a/SRC/configure +++ b/SRC/configure @@ -1758,7 +1758,8 @@ if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; cat >> confdefs.h <<\EOF #define TTCP 1 EOF -;ac_have_ttcp="yes" + + ac_have_ttcp="yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -1773,7 +1774,7 @@ if test "${enable_ttcp+set}" = set; then if test "$enableval" = "yes"; then if test $ac_have_ttcp = "yes"; then cat >> confdefs.h <<\EOF -#define TTCP 1 +#define HAVE_TTCP 1 EOF else @@ -1783,7 +1784,7 @@ EOF else if test $ac_have_ttcp = "yes"; then cat >> confdefs.h <<\EOF -#define TTCP 1 +#define HAVE_TTCP 1 EOF fi diff --git a/SRC/configure.in b/SRC/configure.in index 9302149..0aeca88 100644 --- a/SRC/configure.in +++ b/SRC/configure.in @@ -50,21 +50,22 @@ AC_TRY_COMPILE( #include ], [int foobar = MSG_EOF;], - [AC_DEFINE(TTCP);ac_have_ttcp="yes"], + [AC_DEFINE(TTCP) + ac_have_ttcp="yes"], ac_have_ttcp=no) AC_MSG_RESULT($ac_have_ttcp) AC_ARG_ENABLE(ttcp, [--enable-ttcp T/TCP (Transaction TCP) support], [if test "$enableval" = "yes"; then if test $ac_have_ttcp = "yes"; then - AC_DEFINE(TTCP) + AC_DEFINE(HAVE_TTCP) else AC_MSG_WARN([No T/TCP support on this system, request ignored]) fi fi], dnl Default: enable it if supported if test $ac_have_ttcp = "yes"; then - AC_DEFINE(TTCP) + AC_DEFINE(HAVE_TTCP) fi)