|
1 # Existing set of patches from the desktop gate |
|
2 # Can be potentially sent upstream if there is an active community |
|
3 |
|
4 --- openjade.orig/config/acinclude.m4 |
|
5 +++ openjade/config/acinclude.m4 2002/04/08 23:13:37 |
|
6 @@ -0,0 +1,61 @@ |
|
7 +dnl Configure-time switch with default |
|
8 +dnl |
|
9 +dnl Each switch defines an --enable-FOO and --disable-FOO option in |
|
10 +dnl the resulting configure script. |
|
11 +dnl |
|
12 +dnl Usage: |
|
13 +dnl SMR_SWITCH(name, description, default, pos-def, neg-def) |
|
14 +dnl |
|
15 +dnl where: |
|
16 +dnl |
|
17 +dnl name name of switch; generates --enable-name & --disable-name |
|
18 +dnl options |
|
19 +dnl description help string is set to this prefixed by "enable" or |
|
20 +dnl "disable", whichever is the non-default value |
|
21 +dnl default either "on" or "off"; specifies default if neither |
|
22 +dnl --enable-name nor --disable-name is specified |
|
23 +dnl pos-def a symbol to AC_DEFINE if switch is on (optional) |
|
24 +dnl neg-def a symbol to AC_DEFINE if switch is off (optional) |
|
25 +dnl |
|
26 +AC_DEFUN(SMR_SWITCH, [ |
|
27 + AC_MSG_CHECKING(whether to enable $2) |
|
28 + AC_ARG_ENABLE( |
|
29 + $1, |
|
30 + ifelse($3, on, |
|
31 + [ --disable-[$1] disable [$2]], |
|
32 + [ --enable-[$1] enable [$2]]), |
|
33 + [ if test "$enableval" = yes; then |
|
34 + AC_MSG_RESULT(yes) |
|
35 + ifelse($4, , , AC_DEFINE($4)) |
|
36 + else |
|
37 + AC_MSG_RESULT(no) |
|
38 + ifelse($5, , , AC_DEFINE($5)) |
|
39 + fi ], |
|
40 + ifelse($3, on, |
|
41 + [ AC_MSG_RESULT(yes) |
|
42 + ifelse($4, , , AC_DEFINE($4)) ], |
|
43 + [ AC_MSG_RESULT(no) |
|
44 + ifelse($5, , , AC_DEFINE($5))]))]) |
|
45 + |
|
46 +dnl |
|
47 +dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int |
|
48 +dnl |
|
49 +AC_DEFUN(OJ_SIZE_T_IS_UINT,[ |
|
50 + AC_REQUIRE([AC_TYPE_SIZE_T]) |
|
51 + AC_MSG_CHECKING(whether size_t is unsigned int) |
|
52 + ac_cv_size_t_is_uint=no |
|
53 + AC_LANG_SAVE |
|
54 + AC_LANG_CPLUSPLUS |
|
55 + AC_TRY_COMPILE([#include <unistd.h> |
|
56 + |
|
57 + template<class T> class foo { }; |
|
58 + |
|
59 + ], [ |
|
60 + foo<size_t> x; |
|
61 + foo<unsigned int> y; |
|
62 + x = y; |
|
63 + ],ac_cv_size_t_is_uint=yes) |
|
64 + AC_LANG_RESTORE |
|
65 + AC_MSG_RESULT($ac_cv_size_t_is_uint) |
|
66 + test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT) |
|
67 +]) |
|
68 --- openjade.orig/config/aclocal.m4 |
|
69 +++ openjade/config/aclocal.m4 2002/04/08 23:18:36 |
|
70 @@ -3352,7 +3352,7 @@ |
|
71 dnl the resulting configure script. |
|
72 dnl |
|
73 dnl Usage: |
|
74 -dnl smr_SWITCH(name, description, default, pos-def, neg-def) |
|
75 +dnl SMR_SWITCH(name, description, default, pos-def, neg-def) |
|
76 dnl |
|
77 dnl where: |
|
78 dnl |
|
79 @@ -3365,7 +3365,7 @@ |
|
80 dnl pos-def a symbol to AC_DEFINE if switch is on (optional) |
|
81 dnl neg-def a symbol to AC_DEFINE if switch is off (optional) |
|
82 dnl |
|
83 -AC_DEFUN(smr_SWITCH, [ |
|
84 +AC_DEFUN(SMR_SWITCH, [ |
|
85 AC_MSG_CHECKING(whether to enable $2) |
|
86 AC_ARG_ENABLE( |
|
87 $1, |
|
88 |
|
89 --- openjade.orig/config/configure.in |
|
90 +++ openjade/config/configure.in 2002/04/08 23:13:17 |
|
91 @@ -171,8 +171,8 @@ |
|
92 dnl |
|
93 dnl optional backends |
|
94 dnl |
|
95 -smr_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY) |
|
96 -smr_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY) |
|
97 +SMR_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY) |
|
98 +SMR_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY) |
|
99 |
|
100 |
|
101 dnl |
|
102 --- openjade-1.3.2.orig/jade/Makefile.sub Thu Dec 25 20:59:39 2003 |
|
103 +++ openjade-1.3.2/jade/Makefile.sub Thu Dec 25 20:59:54 2003 |
|
104 @@ -4,7 +4,7 @@ |
|
105 INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style |
|
106 # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \ |
|
107 # ../lib/libosp.a |
|
108 -XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a |
|
109 +XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so |
|
110 GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ |
|
111 HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ |
|
112 TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx |