blob: d29b2ac39d14b0c82447b5fc9867d7ee14c936b2 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From d8e251ef97869ab2c1c82bd374016f402083997c Mon Sep 17 00:00:00 2001
2From: Jorge Pereira <jpereiran@gmail.com>
3Date: Mon, 7 Dec 2015 16:51:07 -0200
4Subject: [PATCH] Fixing issues related to m4 include path
5
6Upstream-Status: Submitted [1]
7
8[1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428
9
10Submmited by: Jorge Pereira <jpereiran@gmail.com>
11---
12 src/modules/rlm_example/config.h.in | 39 ++--------------------
13 src/modules/rlm_ldap/configure | 2 +-
14 src/modules/rlm_pam/config.h.in | 3 ++
15 src/modules/rlm_perl/config.h.in | 3 ++
16 src/modules/rlm_perl/configure.ac | 2 +-
17 src/modules/rlm_radutmp/config.h.in | 3 ++
18 src/modules/rlm_ruby/configure | 1 +
19 src/modules/rlm_ruby/configure.ac | 9 ++---
20 src/modules/rlm_smsotp/config.h.in | 3 ++
21 .../rlm_sql/drivers/rlm_sql_mysql/config.h.in | 3 ++
22 src/modules/rlm_unix/config.h.in | 6 ++++
23 11 files changed, 32 insertions(+), 42 deletions(-)
24
25diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in
26index 2a81ef5..f80de9c 100644
27--- a/src/modules/rlm_example/config.h.in
28+++ b/src/modules/rlm_example/config.h.in
29@@ -1,38 +1,5 @@
30 /* config.h.in. Generated from configure.ac by autoheader. */
31
32-/* Define to 1 if you have the <inttypes.h> header file. */
33-#undef HAVE_INTTYPES_H
34-
35-/* Define to 1 if you have the <memory.h> header file. */
36-#undef HAVE_MEMORY_H
37-
38-/* Define to 1 if you have the `printf' function. */
39-#undef HAVE_PRINTF
40-
41-/* Define to 1 if you have the <stdint.h> header file. */
42-#undef HAVE_STDINT_H
43-
44-/* Define to 1 if you have the <stdio.h> header file. */
45-#undef HAVE_STDIO_H
46-
47-/* Define to 1 if you have the <stdlib.h> header file. */
48-#undef HAVE_STDLIB_H
49-
50-/* Define to 1 if you have the <strings.h> header file. */
51-#undef HAVE_STRINGS_H
52-
53-/* Define to 1 if you have the <string.h> header file. */
54-#undef HAVE_STRING_H
55-
56-/* Define to 1 if you have the <sys/stat.h> header file. */
57-#undef HAVE_SYS_STAT_H
58-
59-/* Define to 1 if you have the <sys/types.h> header file. */
60-#undef HAVE_SYS_TYPES_H
61-
62-/* Define to 1 if you have the <unistd.h> header file. */
63-#undef HAVE_UNISTD_H
64-
65 /* Define to the address where bug reports for this package should be sent. */
66 #undef PACKAGE_BUGREPORT
67
68@@ -45,8 +12,8 @@
69 /* Define to the one symbol short name of this package. */
70 #undef PACKAGE_TARNAME
71
72+/* Define to the home page for this package. */
73+#undef PACKAGE_URL
74+
75 /* Define to the version of this package. */
76 #undef PACKAGE_VERSION
77-
78-/* Define to 1 if you have the ANSI C header files. */
79-#undef STDC_HEADERS
80diff --git a/src/modules/rlm_ldap/configure b/src/modules/rlm_ldap/configure
81index e0c15d9..cdf96d5 100755
82--- a/src/modules/rlm_ldap/configure
83+++ b/src/modules/rlm_ldap/configure
84@@ -3992,7 +3992,7 @@ smart_prefix=
85 $as_echo "#define WITH_SASL 1" >>confdefs.h
86
87 SASL=sasl.c
88- fi
89+ fi
90 fi
91
92 targetname=rlm_ldap
93diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in
94index 32ef6ff..1ad20c5 100644
95--- a/src/modules/rlm_pam/config.h.in
96+++ b/src/modules/rlm_pam/config.h.in
97@@ -45,6 +45,9 @@
98 /* Define to the one symbol short name of this package. */
99 #undef PACKAGE_TARNAME
100
101+/* Define to the home page for this package. */
102+#undef PACKAGE_URL
103+
104 /* Define to the version of this package. */
105 #undef PACKAGE_VERSION
106
107diff --git a/src/modules/rlm_perl/config.h.in b/src/modules/rlm_perl/config.h.in
108index 989ed53..f80de9c 100644
109--- a/src/modules/rlm_perl/config.h.in
110+++ b/src/modules/rlm_perl/config.h.in
111@@ -12,5 +12,8 @@
112 /* Define to the one symbol short name of this package. */
113 #undef PACKAGE_TARNAME
114
115+/* Define to the home page for this package. */
116+#undef PACKAGE_URL
117+
118 /* Define to the version of this package. */
119 #undef PACKAGE_VERSION
120diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
121index 44c5fc9..6b2a043 100644
122--- a/src/modules/rlm_perl/configure.ac
123+++ b/src/modules/rlm_perl/configure.ac
124@@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c)
125 AC_REVISION($Revision$)
126 AC_DEFUN(modname,[rlm_perl])
127
128-m4_include([ax_with_prog.m4])
129+m4_include([m4/ax_with_prog.m4])
130
131 if test x$with_[]modname != xno; then
132 AC_PROG_CC
133diff --git a/src/modules/rlm_radutmp/config.h.in b/src/modules/rlm_radutmp/config.h.in
134index 9a883cc..750b434 100644
135--- a/src/modules/rlm_radutmp/config.h.in
136+++ b/src/modules/rlm_radutmp/config.h.in
137@@ -42,6 +42,9 @@
138 /* Define to the one symbol short name of this package. */
139 #undef PACKAGE_TARNAME
140
141+/* Define to the home page for this package. */
142+#undef PACKAGE_URL
143+
144 /* Define to the version of this package. */
145 #undef PACKAGE_VERSION
146
147diff --git a/src/modules/rlm_ruby/configure b/src/modules/rlm_ruby/configure
148index 15868ab..c728af2 100755
149--- a/src/modules/rlm_ruby/configure
150+++ b/src/modules/rlm_ruby/configure
151@@ -1875,6 +1875,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
152
153
154
155+
156 # ===========================================================================
157 # http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
158 # ===========================================================================
159diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac
160index 9306382..f1c8118 100644
161--- a/src/modules/rlm_ruby/configure.ac
162+++ b/src/modules/rlm_ruby/configure.ac
163@@ -3,15 +3,16 @@ AC_INIT(rlm_ruby.c)
164 AC_REVISION($Revision: 1.9 $)
165 AC_DEFUN(modname,[rlm_ruby])
166
167-m4_include([ax_with_prog.m4])
168+m4_include([m4/ax_with_prog.m4])
169
170 AC_DEFUN([AX_WITH_RUBY],[
171 AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin])
172 ])
173
174-m4_include([ax_compare_version.m4])
175-m4_include([ax_prog_ruby_version.m4])
176-m4_include([ax_ruby_devel.m4])
177+
178+m4_include([m4/ax_compare_version.m4])
179+m4_include([m4/ax_prog_ruby_version.m4])
180+m4_include([m4/ax_ruby_devel.m4])
181
182 targetname=modname
183 mod_cflags=
184diff --git a/src/modules/rlm_smsotp/config.h.in b/src/modules/rlm_smsotp/config.h.in
185index 5feaf91..9e69f85 100644
186--- a/src/modules/rlm_smsotp/config.h.in
187+++ b/src/modules/rlm_smsotp/config.h.in
188@@ -42,6 +42,9 @@
189 /* Define to the one symbol short name of this package. */
190 #undef PACKAGE_TARNAME
191
192+/* Define to the home page for this package. */
193+#undef PACKAGE_URL
194+
195 /* Define to the version of this package. */
196 #undef PACKAGE_VERSION
197
198diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in
199index e03d1a9..6262c48 100644
200--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in
201+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in
202@@ -18,5 +18,8 @@
203 /* Define to the one symbol short name of this package. */
204 #undef PACKAGE_TARNAME
205
206+/* Define to the home page for this package. */
207+#undef PACKAGE_URL
208+
209 /* Define to the version of this package. */
210 #undef PACKAGE_VERSION
211diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in
212index dcb9aa2..70b4680 100644
213--- a/src/modules/rlm_unix/config.h.in
214+++ b/src/modules/rlm_unix/config.h.in
215@@ -1,5 +1,8 @@
216 /* config.h.in. Generated from configure.ac by autoheader. */
217
218+/* Define to 1 if you have the `getpwnam' function. */
219+#undef HAVE_GETPWNAM
220+
221 /* Define to 1 if you have the `getspnam' function. */
222 #undef HAVE_GETSPNAM
223
224@@ -54,6 +57,9 @@
225 /* Define to the one symbol short name of this package. */
226 #undef PACKAGE_TARNAME
227
228+/* Define to the home page for this package. */
229+#undef PACKAGE_URL
230+
231 /* Define to the version of this package. */
232 #undef PACKAGE_VERSION
233
234--
2352.3.5
236