diff --git a/Makefile.in b/Makefile.in index 12255554..9a246593 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,19 +20,9 @@ # # Makefile for building the Phoenix server executable. # -# Copyright 1992-1996, 2000-2003 by Deven T. Corzine. All rights reserved. +# Copyright 1992-2021 Deven T. Corzine # -# This file is part of the Phoenix conferencing system. -# -# This file may be distributed under the terms of the Q Public License -# as defined by Trolltech AS of Norway (except for Choice of Law) and as -# appearing in the file LICENSE.QPL included in the packaging of this file. -# -# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# -# Visit or contact -# for more information or if any conditions of this licensing are unclear. +# SPDX-License-Identifier: MIT # VPATH = @srcdir@ @@ -220,9 +210,8 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ - COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub depcomp install-sh missing \ - mkinstalldirs + INSTALL NEWS README TODO compile config.guess config.sub \ + depcomp install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -233,9 +222,9 @@ am__remove_distdir = \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi am__post_remove_distdir = $(am__remove_distdir) -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip GZIP_ENV = --best -DIST_TARGETS = dist-gzip +DIST_TARGETS = dist-bzip2 dist-gzip dist-zip # Exists only to be overridden by the user if desired. AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print @@ -339,6 +328,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign check-news dist-bzip2 dist-zip \ + filename-length-max=99 no-installinfo readme-alpha std-options + makepw_SOURCES = makepw.c phoenixd_SOURCES = block.h boolean.h constants.h discussion.h event.h \ eventqueue.h fd.h fdtable.h functions.h general.h globals.h hash.h \ @@ -348,8 +340,8 @@ phoenixd_SOURCES = block.h boolean.h constants.h discussion.h event.h \ hash.cc listen.cc output.cc outstr.cc phoenix.cc sendlist.cc \ session.cc string.cc telnet.cc timestamp.cc user.cc -EXTRA_DIST = CREDITS HISTORY KLUDGES LICENSE.QPL OVERVIEW PORTING RELEASES \ - TOUR bootstrap passwd +EXTRA_DIST = .reuse CREDITS HISTORY INSTALL.generic KLUDGES LICENSE LICENSES \ + OVERVIEW PORTING README.md bootstrap passwd version-gen all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -362,15 +354,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -446,6 +438,22 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err &2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ @@ -489,6 +497,22 @@ uninstall-sbinPROGRAMS: clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) +installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) + bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err &2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad + makepw$(EXEEXT): $(makepw_OBJECTS) $(makepw_DEPENDENCIES) $(EXTRA_makepw_DEPENDENCIES) @rm -f makepw$(EXEEXT) $(AM_V_CCLD)$(LINK) $(makepw_OBJECTS) $(makepw_LDADD) $(LIBS) @@ -617,6 +641,12 @@ distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am distdir-am: $(DISTFILES) + @case `sed 15q $(srcdir)/NEWS` in \ + *"$(VERSION)"*) : ;; \ + *) \ + echo "NEWS not updated; not releasing" 1>&2; \ + exit 1;; \ + esac $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -655,10 +685,14 @@ distdir-am: $(DISTFILES) ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" + @if test -z "$(am__skip_length_check)" && find "$(distdir)" -type f -print | \ + grep '^...................................................................................................' 1>&2; then \ + echo 'error: the above filenames are too long' 1>&2; \ + exit 1; \ + else :; fi dist-gzip: distdir tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -688,7 +722,6 @@ dist-shar: distdir @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) - dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) @@ -887,7 +920,7 @@ install-ps: install-ps-am install-ps-am: -installcheck-am: +installcheck-am: installcheck-binPROGRAMS installcheck-sbinPROGRAMS maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -940,7 +973,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-sbinPROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + installcheck-am installcheck-binPROGRAMS \ + installcheck-sbinPROGRAMS installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-sbinPROGRAMS diff --git a/configure b/configure index 71e5b23e..8e5fcbe9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Phoenix 1.0.0.beta.11.102-db69562. +# Generated by GNU Autoconf 2.71 for Phoenix 1.0.0. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Phoenix' PACKAGE_TARNAME='phoenix' -PACKAGE_VERSION='1.0.0.beta.11.102-db69562' -PACKAGE_STRING='Phoenix 1.0.0.beta.11.102-db69562' +PACKAGE_VERSION='1.0.0' +PACKAGE_STRING='Phoenix 1.0.0' PACKAGE_BUGREPORT='bugs@phoenix-cmc.org' PACKAGE_URL='' @@ -1316,7 +1316,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Phoenix 1.0.0.beta.11.102-db69562 to adapt to many kinds of systems. +\`configure' configures Phoenix 1.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1387,7 +1387,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Phoenix 1.0.0.beta.11.102-db69562:";; + short | recursive ) echo "Configuration of Phoenix 1.0.0:";; esac cat <<\_ACEOF @@ -1482,7 +1482,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Phoenix configure 1.0.0.beta.11.102-db69562 +Phoenix configure 1.0.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1839,7 +1839,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Phoenix $as_me 1.0.0.beta.11.102-db69562, which was +It was created by Phoenix $as_me 1.0.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3328,7 +3328,7 @@ fi # Define the identity of the package. PACKAGE='phoenix' - VERSION='1.0.0.beta.11.102-db69562' + VERSION='1.0.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6944,7 +6944,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Phoenix $as_me 1.0.0.beta.11.102-db69562, which was +This file was extended by Phoenix $as_me 1.0.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7012,7 +7012,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Phoenix config.status 1.0.0.beta.11.102-db69562 +Phoenix config.status 1.0.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\"