1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
https://github.com/latchset/libverto/pull/31
Strips bashisms from configure.ac causing breakage in net-nds/gssproxy
https://bugs.gentoo.org/762823
From bf5e1eac51cd8aa801c0125b892412bb73b97b08 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 23 Jun 2021 03:29:56 +0100
Subject: [PATCH] Fix bashisms in configure.ac
'==' is not supported in POSIX shells. = is equivalent for us, so let's
use that instead.
Bug: https://bugs.gentoo.org/762823
---
configure.ac | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1e510dc..30b7aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,15 +82,15 @@ AC_ARG_WITH([libevent],
# Ensure that if a builtin is chosen only one is built
BUILTIN_MODULE=
-if test x$WITH_GLIB == xbuiltin; then
+if test x$WITH_GLIB = xbuiltin; then
BUILTIN_MODULE=glib
WITH_LIBEV=no
WITH_LIBEVENT=no
-elif test x$WITH_LIBEV == xbuiltin; then
+elif test x$WITH_LIBEV = xbuiltin; then
BUILTIN_MODULE=libev
WITH_LIBGLIB=no
WITH_LIBEVENT=no
-elif test x$WITH_LIBEVENT == xbuiltin; then
+elif test x$WITH_LIBEVENT = xbuiltin; then
BUILTIN_MODULE=libevent
WITH_LIBGLIB=no
WITH_LIBEV=no
@@ -101,20 +101,20 @@ if test x$BUILTIN_MODULE != x; then
fi
# Ensure that there is only one default (convert duplicate default to yes)
-if test x$WITH_GLIB == xdefault; then
+if test x$WITH_GLIB = xdefault; then
AC_DEFINE([DEFUALT_MODULE], [glib])
- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
+ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
+ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
fi
-if test x$WITH_LIBEV == xdefault; then
+if test x$WITH_LIBEV = xdefault; then
AC_DEFINE([DEFUALT_MODULE], [libev])
- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes
- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
+ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes
+ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
fi
-if test x$WITH_LIBEVENT == xdefault; then
+if test x$WITH_LIBEVENT = xdefault; then
AC_DEFINE([DEFUALT_MODULE], [libevent])
- test x$WITH_GLIB == xdefault && WITH_GLIB=yes
- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
+ test x$WITH_GLIB = xdefault && WITH_GLIB=yes
+ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
fi
BUILD_GLIB=no
@@ -124,7 +124,7 @@ BUILD_LIBEVENT=no
if test x$WITH_GLIB != xno; then
PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],
[test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")])
- if test x$BUILD_GLIB == xauto; then
+ if test x$BUILD_GLIB = xauto; then
BUILD_GLIB=yes
fi
fi
@@ -138,7 +138,7 @@ if test x$WITH_LIBEV != xno; then
),
[test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")]
)
- if test x$BUILD_LIBEV == xauto; then
+ if test x$BUILD_LIBEV = xauto; then
BUILD_LIBEV=yes
fi
fi
@@ -146,17 +146,17 @@ fi
if test x$WITH_LIBEVENT != xno; then
PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT],
[test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")])
- if test x$BUILD_LIBEVENT == xauto; then
+ if test x$BUILD_LIBEVENT = xauto; then
BUILD_LIBEVENT=yes
fi
fi
-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno])
-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno])
-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno])
-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib])
-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev])
-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent])
+AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno])
+AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno])
+AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno])
+AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib])
+AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev])
+AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent])
AC_MSG_NOTICE()
AC_MSG_NOTICE([BUILD CONFIGURATION])
--
2.32.0
|
