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
|
From: Teemu Hukkanen <tjhukkan@iki.fi>
Date: Sat, 16 Mar 2024 16:04:36 +0200
Subject: Updates for modern autoconf versions
Origin: upstream
Forwarded: not-needed
---
acconfig.h | 10 ----------
acinclude.m4 | 11 ++++++++---
configure.in | 3 +--
3 files changed, 9 insertions(+), 15 deletions(-)
delete mode 100644 acconfig.h
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 45f5ad0..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Enable debugging mode. */
-#undef DEBUG_MODE
-
-@BOTTOM@
-
-/* Define to 'int' if <sys/socket.h> doesn't define. */
-#undef socklen_t
-
-/* Define to 0xffffffff if <netinet/in.h> doesn't define. */
-#undef INADDR_NONE
diff --git a/acinclude.m4 b/acinclude.m4
index ba982e3..8ec0ca0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,7 @@
dnl HTTPTUNNEL_TYPE_SOCKLEN_T
dnl Check for the existance of type socklen_t.
-AC_DEFUN(HTTPTUNNEL_TYPE_SOCKLEN_T,
+AC_DEFUN([HTTPTUNNEL_TYPE_SOCKLEN_T],
[AC_CACHE_CHECK([for socklen_t], ac_cv_httptunnel_type_socklen_t,
[
AC_TRY_COMPILE(
@@ -12,7 +12,8 @@ AC_DEFUN(HTTPTUNNEL_TYPE_SOCKLEN_T,
ac_cv_httptunnel_type_socklen_t=no)
])
if test $ac_cv_httptunnel_type_socklen_t != yes; then
- AC_DEFINE(socklen_t, int)
+ AC_DEFINE(socklen_t, int,
+ [Define to 'int' if <sys/socket.h> doesn't define.])
fi
])
@@ -20,7 +21,7 @@ AC_DEFUN(HTTPTUNNEL_TYPE_SOCKLEN_T,
dnl HTTPTUNNEL_DEFINE_INADDR_NONE
dnl Check for the existance of define INADDR_NONE
-AC_DEFUN(HTTPTUNNEL_DEFINE_INADDR_NONE,
+AC_DEFUN([HTTPTUNNEL_DEFINE_INADDR_NONE],
[AC_CACHE_CHECK([whether INADDR_NONE is defined], ac_cv_httptunnel_define_inaddr_none,
[
AC_TRY_COMPILE(
@@ -34,3 +35,7 @@ AC_DEFUN(HTTPTUNNEL_DEFINE_INADDR_NONE,
AC_DEFINE(INADDR_NONE, 0xffffffff)
fi
])
+
+AH_BOTTOM([/* Define to 0xffffffff if <netinet/in.h> doesn't define. */
+#undef INADDR_NONE])
+
diff --git a/configure.in b/configure.in
index 8259998..eafad40 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AM_CONDITIONAL(SRCDIR, test "x$srcdir" != x.)
AC_ARG_ENABLE(debug,
[ --enable-debug enable debugging],
- AC_DEFINE(DEBUG_MODE, 1))
+ AC_DEFINE(DEBUG_MODE, 1, [Enable debugging mode.]))
if test "x$CFLAGS" = x; then
if test "x$enable_debug" != x; then
@@ -22,7 +22,6 @@ fi
dnl Checks for programs.
AC_PROG_AWK
AC_PROG_CC
-AC_ARG_PROGRAM
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
|
