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
|
Patch to make configure.in work with a recent autoconf.
Forwarded upstream to https://github.com/ekenberg/quotatool/pull/19
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/main.c)
+AC_INIT
+AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(tools)
@@ -17,20 +18,20 @@
dnl Set program, version info
PROGNAME=quotatool
AC_SUBST(PROGNAME)
-AC_DEFINE_UNQUOTED(PROGNAME, "$PROGNAME")
+AC_DEFINE_UNQUOTED(PROGNAME, "$PROGNAME", [Name of the current program])
AC_SUBST(MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION)
+AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major version number])
AC_SUBST(MINOR_VERSION)
-AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION)
+AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor version number])
AC_SUBST(PATCHLEVEL)
-AC_DEFINE_UNQUOTED(PATCHLEVEL, "$PATCHLEVEL")
+AC_DEFINE_UNQUOTED(PATCHLEVEL, "$PATCHLEVEL", [Patch level version number])
-AC_DEFINE_UNQUOTED(COPYRIGHT_NOTICE, "$COPYRIGHT_NOTICE")
+AC_DEFINE_UNQUOTED(COPYRIGHT_NOTICE, "$COPYRIGHT_NOTICE", [Copyright notice])
-AC_DEFINE_UNQUOTED(WWW_URL, "$WWW_URL")
+AC_DEFINE_UNQUOTED(WWW_URL, "$WWW_URL", [Upstream homepage])
dnl get the system type (for the makefile)
@@ -38,31 +39,31 @@
case [$host] in
*linux*)
PLATFORM=linux
- AC_DEFINE(PLATFORM_LINUX, 1)
+ AC_DEFINE(PLATFORM_LINUX, 1, [Is this a Linux platform?])
;;
*solaris*)
PLATFORM=solaris
- AC_DEFINE(PLATFORM_SOLARIS, 1)
+ AC_DEFINE(PLATFORM_SOLARIS, 1, [Is this a Solaris platform?])
;;
*aix*)
PLATFORM=aix
- AC_DEFINE(PLATFORM_AIX, 1)
+ AC_DEFINE(PLATFORM_AIX, 1, [Is this an AIX platform?])
;;
*freebsd*|*openbsd*|*netbsd*)
PLATFORM=bsd
- AC_DEFINE(PLATFORM_BSD, 1)
+ AC_DEFINE(PLATFORM_BSD, 1, [Is this a *BSD platform?])
;;
*apple-darwin*)
PLATFORM=darwin
- AC_DEFINE(PLATFORM_DARWIN, 1)
+ AC_DEFINE(PLATFORM_DARWIN, 1, [Is this an OSX platform?])
;;
*)
PLATFORM=unknown
- AC_DEFINE(PLATFORM_UNKNOWN, 1)
+ AC_DEFINE(PLATFORM_UNKNOWN, 1, [Is this an unknown platform?])
;;
esac
AC_SUBST(PLATFORM)
-AC_DEFINE_UNQUOTED(PLATFORM, $PLATFORM)
+AC_DEFINE_UNQUOTED(PLATFORM, $PLATFORM, [Name of the current platform])
dnl Check for programs.
@@ -106,13 +107,13 @@
AC_TYPE_UID_T
AC_C_INLINE
AC_CHECK_TYPE(u_int64_t, HAVE_U_INT64_T=1, HAVE_U_INT64_T=0)
-AC_DEFINE_UNQUOTED(HAVE_U_INT64_T, $HAVE_U_INT64_T)
+AC_DEFINE_UNQUOTED(HAVE_U_INT64_T, $HAVE_U_INT64_T, [Can we use uint64_t?])
dnl Check for library functions.
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(strdup strerror strtol strtod strchr)
-test [x$PLATFORM] = [xlinux] && AC_DEFINE(HAVE_GNU_GETOPT, 1)
+test [x$PLATFORM] = [xlinux] && AC_DEFINE(HAVE_GNU_GETOPT, 1, [Can we use GNU getopt?])
dnl check for strlcpy and strlcat (mostly BSD)
AC_CHECK_FUNCS(strlcpy strlcat)
@@ -121,9 +122,10 @@
AC_ARG_WITH(gnu-getopt, \
[--with-gnu-getopt getopt() is GNU getopt],\
- test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1))
+ test [x$withval] != [xno] || AC_DEFINE(HAVE_GNU_GETOPT, 1, [Can we use GNU getopt?]))
dnl Create output files
AC_CONFIG_HEADER(src/config.h)
-AC_OUTPUT(local.mk)
+AC_CONFIG_FILES([local.mk])
+AC_OUTPUT
|
