Skip to content

Commit 0e5cbd0

Browse files
committed
Merge bitcoin-core/secp256k1#1088: configure: Use modern way to set AR
0d253d5 configure: Use modern way to set AR (Tim Ruffing) Pull request description: ACKs for top commit: jb55: tACK 0d253d5 hebasto: ACK 0d253d5 jonasnick: ACK 0d253d5 Tree-SHA512: c85a068b0b6cd0ae59c796d4493d50b1d92394b8620dd65affb5aaac889a41aa625408062f49fbed761217ab2bc35ec10942684a84487cb81becdadf5f2ae2af
2 parents ac83be3 + 0d253d5 commit 0e5cbd0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ coverage.*.html
4646

4747
src/libsecp256k1-config.h
4848
src/libsecp256k1-config.h.in
49+
build-aux/ar-lib
4950
build-aux/config.guess
5051
build-aux/config.sub
5152
build-aux/depcomp

configure.ac

+5-6
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,23 @@ AC_CANONICAL_HOST
2525
AH_TOP([#ifndef LIBSECP256K1_CONFIG_H])
2626
AH_TOP([#define LIBSECP256K1_CONFIG_H])
2727
AH_BOTTOM([#endif /*LIBSECP256K1_CONFIG_H*/])
28-
AM_INIT_AUTOMAKE([foreign subdir-objects])
2928

30-
LT_INIT([win32-dll])
29+
# Require Automake 1.11.2 for AM_PROG_AR
30+
AM_INIT_AUTOMAKE([1.11.2 foreign subdir-objects])
3131

3232
# Make the compilation flags quiet unless V=1 is used.
3333
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
3434

3535
PKG_PROG_PKG_CONFIG
3636

37-
AC_PATH_TOOL(AR, ar)
38-
AC_PATH_TOOL(RANLIB, ranlib)
39-
AC_PATH_TOOL(STRIP, strip)
40-
4137
AC_PROG_CC
4238
if test x"$ac_cv_prog_cc_c89" = x"no"; then
4339
AC_MSG_ERROR([c89 compiler support required])
4440
fi
4541
AM_PROG_AS
42+
AM_PROG_AR
43+
44+
LT_INIT([win32-dll])
4645

4746
build_windows=no
4847

0 commit comments

Comments
 (0)