]>
Commit | Line | Data |
---|---|---|
b0497b3a | 1 | --- TeXmacs-0.3.5.8-src/configure.in~ Sun Dec 2 11:57:09 2001 |
2 | +++ TeXmacs-0.3.5.8-src/configure.in Sun Dec 2 11:57:09 2001 | |
3 | @@ -26,16 +26,6 @@ | |
4 | AC_PROG_CC | |
5 | AC_PROG_CXX | |
6 | AC_LANG_CPLUSPLUS | |
7 | -AC_MSG_CHECKING(whether GNU C++ compiler is default) | |
8 | -case "$GXX" in | |
9 | - yes ) | |
10 | - AC_MSG_RESULT(yes) | |
11 | - ;; | |
12 | - *) | |
13 | - AC_MSG_WARN(no) | |
14 | - CXX="g++" | |
15 | - ;; | |
16 | -esac | |
17 | GUILE_FLAGS | |
18 | CPP_X_HEADERS | |
19 | ||
20 | @@ -252,80 +242,6 @@ | |
21 | AC_SUBST(CONFIG_WORD_MASK) | |
22 | AC_SUBST(CONFIG_MAX_FAST) | |
23 | ||
24 | -#-------------------------------------------------------------------- | |
25 | -# Default paths for installation | |
26 | -#-------------------------------------------------------------------- | |
27 | - | |
28 | -if test "$prefix" = ""; then | |
29 | - prefix=/usr/local | |
30 | -fi | |
31 | -if test "$prefix" = "NONE"; then | |
32 | - prefix=/usr/local | |
33 | -fi | |
34 | -if test "$exec_prefix" = ""; then | |
35 | - exec_prefix=${prefix} | |
36 | -fi | |
37 | -if test "$exec_prefix" = "NONE"; then | |
38 | - exec_prefix=${prefix} | |
39 | -fi | |
40 | -if test "$exec_prefix" = '${prefix}'; then | |
41 | - exec_prefix=${prefix} | |
42 | -fi | |
43 | -if test "$includedir" = ""; then | |
44 | - includedir=${exec_prefix}/include | |
45 | -fi | |
46 | -if test "$includedir" = "NONE"; then | |
47 | - includedir=${exec_prefix}/include | |
48 | -fi | |
49 | -if test "$includedir" = '${exec_prefix}/include'; then | |
50 | - includedir=${exec_prefix}/include | |
51 | -fi | |
52 | -if test "$libdir" = ""; then | |
53 | - libdir=${exec_prefix}/lib | |
54 | -fi | |
55 | -if test "$libdir" = "NONE"; then | |
56 | - libdir=${exec_prefix}/lib | |
57 | -fi | |
58 | -if test "$libdir" = '${exec_prefix}/lib'; then | |
59 | - libdir=${exec_prefix}/lib | |
60 | -fi | |
61 | -if test "$bindir" = ""; then | |
62 | - bindir=${exec_prefix}/bin | |
63 | -fi | |
64 | -if test "$bindir" = "NONE"; then | |
65 | - bindir=${exec_prefix}/bin | |
66 | -fi | |
67 | -if test "$bindir" = '${exec_prefix}/bin'; then | |
68 | - bindir=${exec_prefix}/bin | |
69 | -fi | |
70 | -if test "$datadir" = ""; then | |
71 | - datadir=${prefix}/share | |
72 | -fi | |
73 | -if test "$datadir" = "NONE"; then | |
74 | - datadir=${prefix}/share | |
75 | -fi | |
76 | -if test "$datadir" = '${prefix}/share'; then | |
77 | - datadir=${prefix}/share | |
78 | -fi | |
79 | -if test "$mandir" = ""; then | |
80 | - mandir=${prefix}/man | |
81 | -fi | |
82 | -if test "$mandir" = "NONE"; then | |
83 | - mandir=${prefix}/man | |
84 | -fi | |
85 | -if test "$mandir" = '${prefix}/man'; then | |
86 | - mandir=${prefix}/man | |
87 | -fi | |
88 | -if test "$libexecdir" = ""; then | |
89 | - libexecdir=${exec_prefix}/libexec | |
90 | -fi | |
91 | -if test "$libexecdir" = "NONE"; then | |
92 | - libexecdir=${exec_prefix}/libexec | |
93 | -fi | |
94 | -if test "$libexecdir" = '${exec_prefix}/libexec'; then | |
95 | - libexecdir=${exec_prefix}/libexec | |
96 | -fi | |
97 | - | |
98 | curdir="`pwd`" | |
99 | genccpath=${curdir}/gencc/bin | |
100 | tmdir=${PACKAGE}-${VERSION} | |
4fd433c2 | 101 | diff -Nru TeXmacs-0.3.5.8-src/acinclude.m4 TeXmacs-0.3.5.8-src.new/acinclude.m4 |
102 | --- TeXmacs-0.3.5.8-src/acinclude.m4 Thu Jan 1 01:00:00 1970 | |
103 | +++ TeXmacs-0.3.5.8-src.new/acinclude.m4 Mon Dec 3 19:41:15 2001 | |
104 | @@ -0,0 +1,29 @@ | |
105 | +#------------------------------------------------------------------- | |
106 | +# Modify the X include files to make them C++-compatible, if needed | |
107 | +#------------------------------------------------------------------- | |
108 | + | |
109 | +AC_DEFUN([CPP_X_HEADERS],[ | |
110 | +AC_MSG_CHECKING(for C++-compatible X header files) | |
111 | +ac_save_cppflags="$CPPFLAGS" | |
112 | +CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
113 | +AC_TRY_COMPILE([#include <X11/Xlib.h> | |
114 | +#include <X11/Xutil.h>],, | |
115 | +echo yes, | |
116 | +[rm -rf X11 | |
117 | +mkdir X11 | |
118 | +if [ "x$x_includes" != xNONE ] | |
119 | +then | |
120 | + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
121 | + < "$x_includes/X11/Xlib.h" > X11/Xlib.h | |
122 | + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
123 | + < "$x_includes/X11/Xutil.h" > X11/Xutil.h | |
124 | +else | |
125 | + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
126 | + < /usr/include/X11/Xlib.h > X11/Xlib.h | |
127 | + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
128 | + < /usr/include/X11/Xutil.h > X11/Xutil.h | |
129 | +fi | |
130 | +X_CFLAGS="-I.. $X_CFLAGS" | |
131 | +echo "no; fixing"]) | |
132 | +CPPFLAGS="$ac_save_cppflags" | |
133 | +]) | |
134 | diff -Nru TeXmacs-0.3.5.8-src/aclocal.m4 TeXmacs-0.3.5.8-src.new/aclocal.m4 | |
135 | --- TeXmacs-0.3.5.8-src/aclocal.m4 Wed Nov 28 09:36:52 2001 | |
136 | +++ TeXmacs-0.3.5.8-src.new/aclocal.m4 Thu Jan 1 01:00:00 1970 | |
137 | @@ -1,54 +0,0 @@ | |
138 | - | |
139 | -#------------------------------------------------------------------- | |
140 | -# Modified version of GUILE_FLAGS in guile.m4 | |
141 | -# from the official guile distribution | |
142 | -#------------------------------------------------------------------- | |
143 | - | |
144 | -AC_DEFUN([GUILE_FLAGS],[ | |
145 | -## The GUILE_FLAGS macro. | |
146 | - ## First, let's just see if we can find Guile at all. | |
147 | - AC_MSG_CHECKING(for Guile) | |
148 | - guile-config link > /dev/null || { | |
149 | - echo "configure: cannot find guile-config; is Guile installed?" 1>&2 | |
150 | - exit 1 | |
151 | - } | |
152 | - GUILE_ORIGINAL_CFLAGS="`guile-config compile`" | |
153 | - GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS" | |
154 | - GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile" | |
155 | - GUILE_LDFLAGS="`guile-config link`" | |
156 | - GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap" | |
157 | - AC_SUBST(GUILE_CFLAGS) | |
158 | - AC_SUBST(GUILE_LDFLAGS) | |
159 | - AC_MSG_RESULT(yes) | |
160 | -]) | |
161 | - | |
162 | - | |
163 | -#------------------------------------------------------------------- | |
164 | -# Modify the X include files to make them C++-compatible, if needed | |
165 | -#------------------------------------------------------------------- | |
166 | - | |
167 | -AC_DEFUN(CPP_X_HEADERS,[ | |
168 | -AC_MSG_CHECKING(for C++-compatible X header files) | |
169 | -ac_save_cppflags="$CPPFLAGS" | |
170 | -CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
171 | -AC_TRY_COMPILE([#include <X11/Xlib.h> | |
172 | -#include <X11/Xutil.h>],, | |
173 | -echo yes, | |
174 | -[rm -rf X11 | |
175 | -mkdir X11 | |
176 | -if [ "x$x_includes" != xNONE ] | |
177 | -then | |
178 | - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
179 | - < "$x_includes/X11/Xlib.h" > X11/Xlib.h | |
180 | - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
181 | - < "$x_includes/X11/Xutil.h" > X11/Xutil.h | |
182 | -else | |
183 | - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
184 | - < /usr/include/X11/Xlib.h > X11/Xlib.h | |
185 | - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \ | |
186 | - < /usr/include/X11/Xutil.h > X11/Xutil.h | |
187 | -fi | |
188 | -X_CFLAGS="-I.. $X_CFLAGS" | |
189 | -echo "no; fixing"]) | |
190 | -CPPFLAGS="$ac_save_cppflags" | |
191 | -]) |