blob: 638d950765692e7e8970b56d34766e7d125a3a41 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 69cb6d4bb5dd56a48695c0581a7d853e427b0ea3 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 24 Jul 2018 14:54:41 +0800
4Subject: [PATCH] freeradius: Fixing issues related to m4 include path
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Upstream-Status: Submitted [1]
7
8[1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428
9
10Submmited by: Jorge Pereira <jpereiran@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080011
12Update to version 3.0.17
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016 src/modules/rlm_example/config.h.in | 35 +++--------------------------------
17 src/modules/rlm_pam/config.h.in | 3 +++
18 src/modules/rlm_perl/config.h.in | 3 +++
19 src/modules/rlm_perl/configure.ac | 2 +-
20 src/modules/rlm_radutmp/config.h.in | 3 +++
21 src/modules/rlm_ruby/configure.ac | 8 ++++----
22 src/modules/rlm_smsotp/config.h.in | 3 +++
23 src/modules/rlm_unix/config.h.in | 3 +++
24 8 files changed, 23 insertions(+), 37 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050025
26diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080027index 2a81ef5..4dbb8f4 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028--- a/src/modules/rlm_example/config.h.in
29+++ b/src/modules/rlm_example/config.h.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080030@@ -1,37 +1,5 @@
Brad Bishopd7bf8c12018-02-25 22:55:05 -050031 /* config.h.in. Generated from configure.ac by autoheader. */
32
33-/* Define to 1 if you have the <inttypes.h> header file. */
34-#undef HAVE_INTTYPES_H
35-
36-/* Define to 1 if you have the <memory.h> header file. */
37-#undef HAVE_MEMORY_H
38-
39-/* Define to 1 if you have the `printf' function. */
40-#undef HAVE_PRINTF
41-
42-/* Define to 1 if you have the <stdint.h> header file. */
43-#undef HAVE_STDINT_H
44-
45-/* Define to 1 if you have the <stdio.h> header file. */
46-#undef HAVE_STDIO_H
47-
48-/* Define to 1 if you have the <stdlib.h> header file. */
49-#undef HAVE_STDLIB_H
50-
51-/* Define to 1 if you have the <strings.h> header file. */
52-#undef HAVE_STRINGS_H
53-
54-/* Define to 1 if you have the <string.h> header file. */
55-#undef HAVE_STRING_H
56-
57-/* Define to 1 if you have the <sys/stat.h> header file. */
58-#undef HAVE_SYS_STAT_H
59-
60-/* Define to 1 if you have the <sys/types.h> header file. */
61-#undef HAVE_SYS_TYPES_H
62-
63-/* Define to 1 if you have the <unistd.h> header file. */
64-#undef HAVE_UNISTD_H
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080065
Brad Bishopd7bf8c12018-02-25 22:55:05 -050066 /* Define to the address where bug reports for this package should be sent. */
67 #undef PACKAGE_BUGREPORT
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080068@@ -45,6 +13,9 @@
Brad Bishopd7bf8c12018-02-25 22:55:05 -050069 /* 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
Brad Bishopd7bf8c12018-02-25 22:55:05 -050077
Brad Bishopd7bf8c12018-02-25 22:55:05 -050078diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in
79index 32ef6ff..1ad20c5 100644
80--- a/src/modules/rlm_pam/config.h.in
81+++ b/src/modules/rlm_pam/config.h.in
82@@ -45,6 +45,9 @@
83 /* Define to the one symbol short name of this package. */
84 #undef PACKAGE_TARNAME
85
86+/* Define to the home page for this package. */
87+#undef PACKAGE_URL
88+
89 /* Define to the version of this package. */
90 #undef PACKAGE_VERSION
91
92diff --git a/src/modules/rlm_perl/config.h.in b/src/modules/rlm_perl/config.h.in
93index 989ed53..f80de9c 100644
94--- a/src/modules/rlm_perl/config.h.in
95+++ b/src/modules/rlm_perl/config.h.in
96@@ -12,5 +12,8 @@
97 /* Define to the one symbol short name of this package. */
98 #undef PACKAGE_TARNAME
99
100+/* Define to the home page for this package. */
101+#undef PACKAGE_URL
102+
103 /* Define to the version of this package. */
104 #undef PACKAGE_VERSION
105diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800106index 4b3ff42..69c79cb 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500107--- a/src/modules/rlm_perl/configure.ac
108+++ b/src/modules/rlm_perl/configure.ac
109@@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c)
110 AC_REVISION($Revision$)
111 AC_DEFUN(modname,[rlm_perl])
112
113-m4_include([ax_with_prog.m4])
114+m4_include([m4/ax_with_prog.m4])
115
116 if test x$with_[]modname != xno; then
117 AC_PROG_CC
118diff --git a/src/modules/rlm_radutmp/config.h.in b/src/modules/rlm_radutmp/config.h.in
119index 9a883cc..750b434 100644
120--- a/src/modules/rlm_radutmp/config.h.in
121+++ b/src/modules/rlm_radutmp/config.h.in
122@@ -42,6 +42,9 @@
123 /* Define to the one symbol short name of this package. */
124 #undef PACKAGE_TARNAME
125
126+/* Define to the home page for this package. */
127+#undef PACKAGE_URL
128+
129 /* Define to the version of this package. */
130 #undef PACKAGE_VERSION
131
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500132diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800133index 9306382..ae86a14 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500134--- a/src/modules/rlm_ruby/configure.ac
135+++ b/src/modules/rlm_ruby/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800136@@ -3,15 +3,15 @@ AC_INIT(rlm_ruby.c)
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500137 AC_REVISION($Revision: 1.9 $)
138 AC_DEFUN(modname,[rlm_ruby])
139
140-m4_include([ax_with_prog.m4])
141+m4_include([m4/ax_with_prog.m4])
142
143 AC_DEFUN([AX_WITH_RUBY],[
144 AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin])
145 ])
146
147-m4_include([ax_compare_version.m4])
148-m4_include([ax_prog_ruby_version.m4])
149-m4_include([ax_ruby_devel.m4])
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500150+m4_include([m4/ax_compare_version.m4])
151+m4_include([m4/ax_prog_ruby_version.m4])
152+m4_include([m4/ax_ruby_devel.m4])
153
154 targetname=modname
155 mod_cflags=
156diff --git a/src/modules/rlm_smsotp/config.h.in b/src/modules/rlm_smsotp/config.h.in
157index 5feaf91..9e69f85 100644
158--- a/src/modules/rlm_smsotp/config.h.in
159+++ b/src/modules/rlm_smsotp/config.h.in
160@@ -42,6 +42,9 @@
161 /* Define to the one symbol short name of this package. */
162 #undef PACKAGE_TARNAME
163
164+/* Define to the home page for this package. */
165+#undef PACKAGE_URL
166+
167 /* Define to the version of this package. */
168 #undef PACKAGE_VERSION
169
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500170diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800171index dcb9aa2..16107b8 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500172--- a/src/modules/rlm_unix/config.h.in
173+++ b/src/modules/rlm_unix/config.h.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800174@@ -54,6 +54,9 @@
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500175 /* Define to the one symbol short name of this package. */
176 #undef PACKAGE_TARNAME
177
178+/* Define to the home page for this package. */
179+#undef PACKAGE_URL
180+
181 /* Define to the version of this package. */
182 #undef PACKAGE_VERSION
183
184--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001852.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500186