From a341c3159eaeb4a6386fc3360f8d082e25b26ec3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 29 Apr 2019 17:59:37 +0000 Subject: Fix the failing build --- Makefile.am | 2 ++ configure.ac | 2 +- maketgz | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index bf685e1c2..2cdd8a898 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,8 @@ # ########################################################################### +AM_DISTCHECK_CONFIGURE_FLAGS = --disable-ftp --disable-file --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --without-ssl --disable-libpsl --without-libpsl --without-librtmp --disable-ntlm-wb + AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 8e7234356..e8fe8c64a 100755 --- a/configure.ac +++ b/configure.ac @@ -1627,7 +1627,7 @@ AC_HELP_STRING([--without-amissl], [disable Amiga native SSL/TLS (AmiSSL)]), OPT_AMISSL=$withval) AC_MSG_CHECKING([whether to enable Amiga native SSL/TLS (AmiSSL)]) -if test "$HAVE_PROTO_BSDSOCKET_H" == "1"; then +if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then if test -z "$ssl_backends" -o "x$OPT_AMISSL" != xno; then ssl_msg= if test "x$OPT_AMISSL" != "xno"; then diff --git a/maketgz b/maketgz index 556cca33f..54e508597 100755 --- a/maketgz +++ b/maketgz @@ -123,7 +123,8 @@ findprog() { # Enforce a rerun of configure (updates the VERSION) echo "Re-running config.status" -./config.status --recheck >/dev/null +# CC=clang ./config.status --recheck --disable-ftp --disable-file --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --without-ssl --disable-libpsl --without-libpsl --without-librtmp --disable-ntlm-wb >/dev/null +./config.status --recheck > /dev/null # automake is needed to run to make a non-GNU Makefile.in if Makefile.am has been modified. @@ -157,7 +158,7 @@ tarball="gnurl-$version.tar" tardir="gnurl-$version" # TODO: Here's something we need to fix for nbsd make to work. # MAKE=gmake is required. -gmake -sj dist VERSION=$version +gmake dist VERSION=$version # Now make an Z archive from the tar.gz original @@ -224,5 +225,5 @@ ls -l $targz $compressfile $paxz echo "Run this:" echo "gpg2 -b -a $targz && gpg2 -b -a $compressfile && gpg2 -b -a $paxz" sha1 $targz $compressfile $paxz -md5 -a SHA512 $targz $compressfile $paxz +sum -a SHA512 $targz $compressfile $paxz rmd160 $targz $compressfile $paxz -- cgit v1.2.3