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
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
Patch obtained from OpenEmbedded.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-- config/acinclude.m4
+++ config/acinclude.m4 2002/04/08 23:13:37
@@ -0,0 +1,61 @@
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name name of switch; generates --enable-name & --disable-name
+dnl options
+dnl description help string is set to this prefixed by "enable" or
+dnl "disable", whichever is the non-default value
+dnl default either "on" or "off"; specifies default if neither
+dnl --enable-name nor --disable-name is specified
+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(SMR_SWITCH, [
+ AC_MSG_CHECKING(whether to enable $2)
+ AC_ARG_ENABLE(
+ $1,
+ ifelse($3, on,
+ [ --disable-[$1] disable [$2]],
+ [ --enable-[$1] enable [$2]]),
+ [ if test "$enableval" = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4))
+ else
+ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))
+ fi ],
+ ifelse($3, on,
+ [ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4)) ],
+ [ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))]))])
+
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_MSG_CHECKING(whether size_t is unsigned int)
+ ac_cv_size_t_is_uint=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <unistd.h>
+
+ template<class T> class foo { };
+
+ ], [
+ foo<size_t> x;
+ foo<unsigned int> y;
+ x = y;
+ ],ac_cv_size_t_is_uint=yes)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
Index: openjade-1.3.2/config/acinclude.m4
===================================================================
--- openjade-1.3.2.orig/config/acinclude.m4
+++ openjade-1.3.2/config/acinclude.m4
@@ -1,3 +1,64 @@
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name name of switch; generates --enable-name & --disable-name
+dnl options
+dnl description help string is set to this prefixed by "enable" or
+dnl "disable", whichever is the non-default value
+dnl default either "on" or "off"; specifies default if neither
+dnl --enable-name nor --disable-name is specified
+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(SMR_SWITCH, [
+ AC_MSG_CHECKING(whether to enable $2)
+ AC_ARG_ENABLE(
+ $1,
+ ifelse($3, on,
+ [ --disable-[$1] disable [$2]],
+ [ --enable-[$1] enable [$2]]),
+ [ if test "$enableval" = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4))
+ else
+ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))
+ fi ],
+ ifelse($3, on,
+ [ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4)) ],
+ [ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))]))])
+
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_MSG_CHECKING(whether size_t is unsigned int)
+ ac_cv_size_t_is_uint=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <unistd.h>
+
+ template<class T> class foo { };
+
+ ], [
+ foo<size_t> x;
+ foo<unsigned int> y;
+ x = y;
+ ],ac_cv_size_t_is_uint=yes)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
dnl
dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
dnl
Index: openjade-1.3.2/config/aclocal.m4
===================================================================
--- openjade-1.3.2.orig/config/aclocal.m4
+++ openjade-1.3.2/config/aclocal.m4
@@ -3352,7 +3352,7 @@ dnl Each switch defines an --enable-FOO
dnl the resulting configure script.
dnl
dnl Usage:
-dnl smr_SWITCH(name, description, default, pos-def, neg-def)
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
dnl
dnl where:
dnl
@@ -3365,7 +3365,7 @@ dnl --enable-name nor --disa
dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
dnl
-AC_DEFUN(smr_SWITCH, [
+AC_DEFUN(SMR_SWITCH, [
AC_MSG_CHECKING(whether to enable $2)
AC_ARG_ENABLE(
$1,
Index: openjade-1.3.2/config/configure.in
===================================================================
--- openjade-1.3.2.orig/config/configure.in
+++ openjade-1.3.2/config/configure.in
@@ -243,8 +243,8 @@ AC_ARG_ENABLE(http,
dnl
dnl optional backends
dnl
-smr_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
-smr_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
+SMR_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
+SMR_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
dnl
|
