From 814a850c97b0d535341868b4aefdfe76179330e9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 6 Aug 2024 12:55:05 +0200 Subject: [PATCH] buildconf: drop Use `autoreconf -fi` instead. Conflict:NA Reference:https://github.com/libssh2/libssh2/commit/814a850c97b0d535341868b4aefdfe76179330e9 --- Makefile.am | 2 +- Makefile.in | 2 +- buildconf | 8 -------- tests/ossfuzz/ossfuzz.sh | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100755 buildconf diff --git a/Makefile.am b/Makefile.am index 677be76..9f4252e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ OS400FILES = os400/README400 os400/initscript.sh os400/make.sh \ EXTRA_DIST = $(WIN32FILES) get_ver.awk \ maketgz RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \ CMakeLists.txt cmake git2news.pl libssh2-style.el README.md $(OS400FILES) \ - buildconf Makefile.mk + Makefile.mk ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index ec124e2..e45cabc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -427,7 +427,7 @@ OS400FILES = os400/README400 os400/initscript.sh os400/make.sh \ EXTRA_DIST = $(WIN32FILES) get_ver.awk \ maketgz RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \ CMakeLists.txt cmake git2news.pl libssh2-style.el README.md $(OS400FILES) \ - buildconf Makefile.mk + Makefile.mk ACLOCAL_AMFLAGS = -I m4 all: all-recursive diff --git a/buildconf b/buildconf deleted file mode 100755 index 1649f37..0000000 --- a/buildconf +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo "***" >&2 -echo "*** Do not use buildconf. Instead, use: autoreconf -fi" >&2 -echo "*** Doing it for you now, but buildconf may disappear in the future." >&2 -echo "***" >&2 - -exec ${AUTORECONF:-autoreconf} -fi "${@}" diff --git a/tests/ossfuzz/ossfuzz.sh b/tests/ossfuzz/ossfuzz.sh index 7925fb7..032b686 100755 --- a/tests/ossfuzz/ossfuzz.sh +++ b/tests/ossfuzz/ossfuzz.sh @@ -22,7 +22,7 @@ export MAKEFLAGS apt-get -y install automake libtool libssl-dev zlib1g-dev # Compile the fuzzer. -./buildconf +autoreconf -fi ./configure --disable-shared \ --enable-ossfuzzers \ --disable-examples-build \ -- 2.43.0