Skip to content

Commit 7b6cdb1

Browse files
build: extract common code into macros
Signed-off-by: Ar Rakin <rakinar2@onesoftnet.eu.org>
1 parent 0671129 commit 7b6cdb1

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

configure.ac

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,8 @@ AC_PROG_CPP
128128
AM_PROG_AR
129129
AC_PROG_LN_S
130130
AC_PROG_MKDIR_P
131-
132-
AC_CHECK_PROGS([GPG], [gpg gpg2], [no])
133-
AC_CHECK_PROGS([CURL], [curl], [no])
134-
AC_CHECK_PROGS([WGET], [wget], [no])
135-
136-
AS_IF([test "x$GPG" = "xno"], [GPG=""], [])
137-
AC_SUBST([GPG])
138-
AC_SUBST([WGET])
139-
AC_SUBST([CURL])
131+
CHECK_PROG_GPG
132+
CHECK_PROG_NETWORK_FETCH
140133

141134
LT_INIT
142135

m4/programs.m4

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- Autoconf -*-
2+
3+
AC_DEFUN([CHECK_PROG_GPG], [
4+
AC_CHECK_PROGS([GPG], [gpg gpg2], [no])
5+
6+
AS_IF([test "x$GPG" = "xno"], [GPG=""], [])
7+
AC_SUBST([GPG])
8+
])
9+
10+
AC_DEFUN([CHECK_PROG_NETWORK_FETCH], [
11+
AC_CHECK_PROGS([CURL], [curl], [no])
12+
AC_CHECK_PROGS([WGET], [wget], [no])
13+
14+
AC_SUBST([WGET])
15+
AC_SUBST([CURL])
16+
])

0 commit comments

Comments
 (0)