]>
Commit | Line | Data |
---|---|---|
09e04fec AF |
1 | --- dx-4.1.0/configure.in.wiget Mon Jul 23 18:35:52 2001 |
2 | +++ dx-4.1.0/configure.in Mon Jul 23 19:20:03 2001 | |
3 | @@ -224,10 +224,10 @@ | |
4 | ||
5 | dnl Checks for programs. | |
6 | AC_PROG_RANLIB | |
7 | -DX_PROG_CXX() | |
8 | -DX_PROG_CC | |
9 | -DX_PROG_CPP | |
10 | -AC_CYGWIN | |
11 | +AC_PROG_CXX() | |
12 | +AC_PROG_CC | |
13 | +AC_PROG_CPP | |
14 | +AC_PROG_CXXCPP | |
15 | DX_EXEEXT | |
16 | if test -z "$EXEEXT" ; then | |
17 | DOT_EXE_EXT=""; | |
18 | @@ -312,15 +312,14 @@ | |
19 | AC_HEADER_TIME | |
20 | AC_STRUCT_TM | |
21 | ||
22 | -if test "$CYGWIN" = yes || test "$MINGW32" = yes ; then | |
23 | - ANYDX=AnyDX.dll | |
24 | -else | |
25 | - ANYDX=libAnyDX.so | |
26 | -fi | |
27 | +case $host_os in | |
28 | + *cygwin*) ANYDX=AnyDX.dll ;; | |
29 | + *mingw32*) ANYDX=AnyDX.dll ;; | |
30 | + *) ANYDX=libAnyDX.so ;; | |
31 | +esac | |
32 | ||
33 | -AC_LANG_C | |
34 | +AC_LANG(C) | |
35 | ||
36 | -DX_CYGWIN_MOUNTS | |
37 | DX_SET_RTL_FLAGS | |
38 | AC_CHECK_LIB(gen, regex) | |
39 | ||
40 | @@ -913,7 +912,7 @@ | |
41 | ||
42 | ||
43 | ||
44 | -DX_CHECK_HEADERS( CC/libc.h CC/osfcn.h DPS/XDPSlib.h DPS/dpsXclient.h \ | |
45 | +AC_CHECK_HEADERS( CC/libc.h CC/osfcn.h DPS/XDPSlib.h DPS/dpsXclient.h \ | |
46 | DPS/psops.h GL/gl.h GL/glx.h Mrm/MrmPubli.h X11/Composite.h \ | |
47 | X11/CompositeP.h X11/Constraint.h X11/CoreP.h X11/Intrinsic.h \ | |
48 | X11/IntrinsicI.h X11/IntrinsicP.h X11/Protocols.h X11/Shell.h \ | |
49 | @@ -952,7 +951,7 @@ | |
50 | ||
51 | DX_STREAM_O2 | |
52 | ||
53 | -AC_LANG_CPLUSPLUS | |
54 | +AC_LANG(C++) | |
55 | ||
56 | AC_TRY_LINK([ | |
57 | #include <unistd.h> | |
58 | --- dx-4.1.0/acinclude.m4.wiget Mon Jul 23 18:41:34 2001 | |
59 | +++ dx-4.1.0/acinclude.m4 Mon Jul 23 19:23:30 2001 | |
60 | @@ -1,29 +1,15 @@ | |
61 | dnl | |
62 | -dnl Check for the CYGWIN environment | |
63 | -dnl ------------------------------------------------------------- | |
64 | -AC_DEFUN(AC_CYGWIN, | |
65 | -[AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin, | |
66 | -[AC_TRY_COMPILE(,[ | |
67 | -#ifndef __CYGWIN__ | |
68 | -#define __CYGWIN__ __CYGWIN32__ | |
69 | -#endif | |
70 | -return __CYGWIN__;], | |
71 | -ac_cv_cygwin=yes, ac_cv_cygwin=no) | |
72 | -rm -f conftest*]) | |
73 | -CYGWIN= | |
74 | -test "$ac_cv_cygwin" = yes && CYGWIN=yes]) | |
75 | - | |
76 | -dnl | |
77 | dnl If using CYGWIN, then the extensions to the filenames need to be | |
78 | dnl different than that of UN*X. This sets that up. | |
79 | dnl | |
80 | AC_DEFUN(DX_EXEEXT, | |
81 | -[AC_REQUIRE([AC_CYGWIN]) | |
82 | +[AC_REQUIRE([AC_CANONICAL_HOST]) | |
83 | AC_MSG_CHECKING([for executable suffix]) | |
84 | AC_CACHE_VAL(ac_cv_exeext, | |
85 | -[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then | |
86 | - ac_cv_exeext=.exe | |
87 | -else | |
88 | +[case $host_os in | |
89 | + *cygwin*) ac_cv_exeext=.exe ;; | |
90 | + *mingw32*) ac_cv_exeext=.exe ;; | |
91 | + *) | |
92 | rm -f conftest* | |
93 | echo 'int main () { return 0; }' > conftest.$ac_ext | |
94 | ac_cv_exeext= | |
95 | @@ -39,7 +25,8 @@ | |
96 | fi | |
97 | rm -f conftest* | |
98 | test x"${ac_cv_exeext}" = x && ac_cv_exeext=no | |
99 | -fi]) | |
100 | + ;; | |
101 | +esac]) | |
102 | EXEEXT="" | |
103 | test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} | |
104 | AC_MSG_RESULT(${ac_cv_exeext}) | |
105 | @@ -79,132 +66,6 @@ | |
106 | ||
107 | ||
108 | dnl | |
109 | -dnl Check the headers for the DX build. This is similar to AC_CHECK_HEADER, but | |
110 | -dnl avoids putting every header in the dxconfig.h file. | |
111 | -dnl ------------------------------------------------------------- | |
112 | -AC_DEFUN(DX_CHECK_HEADER, | |
113 | -[dnl Do the transliteration at runtime so arg 1 can be a shell variable. | |
114 | -ac_safe=`echo "$1" | sed 'y%./+-%__p_%'` | |
115 | -AC_MSG_CHECKING([for $1]) | |
116 | -AC_CACHE_VAL(ac_cv_header_$ac_safe, | |
117 | -[DX_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes", | |
118 | - eval "ac_cv_header_$ac_safe=no")])dnl | |
119 | -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
120 | - AC_MSG_RESULT(yes) | |
121 | - ifelse([$2], , :, [$2]) | |
122 | -else | |
123 | - AC_MSG_RESULT(no) | |
124 | -ifelse([$3], , , [$3 | |
125 | -])dnl | |
126 | -fi | |
127 | -]) | |
128 | - | |
129 | - | |
130 | -dnl | |
131 | -dnl Check the headers for the DX build. This is similar to AC_CHECK_HEADERS, but | |
132 | -dnl avoids putting every header in the dxconfig.h file. | |
133 | -dnl ------------------------------------------------------------- | |
134 | -AC_DEFUN(DX_CHECK_HEADERS, | |
135 | -[for ac_hdr in $1 | |
136 | -do | |
137 | -DX_CHECK_HEADER($ac_hdr, | |
138 | -[changequote(, )dnl | |
139 | - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` | |
140 | -changequote([, ])dnl | |
141 | - AC_DEFINE_UNQUOTED($ac_tr_hdr) $2], $3)dnl | |
142 | -done | |
143 | -]) | |
144 | - | |
145 | - | |
146 | -dnl | |
147 | -dnl Try out if the C++ compiler works | |
148 | -dnl DX_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]]) | |
149 | -dnl ------------------------------------------------------------- | |
150 | -AC_DEFUN(DX_TRY_CPP, | |
151 | -[DX_REQUIRE_CPP()dnl | |
152 | -cat > conftest.$ac_ext <<EOF | |
153 | -[#]line __oline__ "configure" | |
154 | -#include "confdefs.h" | |
155 | -[$1] | |
156 | -EOF | |
157 | -dnl Capture the stderr of cpp. eval is necessary to expand ac_cpp. | |
158 | -dnl We used to copy stderr to stdout and capture it in a variable, but | |
159 | -dnl that breaks under sh -x, which writes compile commands starting | |
160 | -dnl with ` +' to stderr in eval and subshells. | |
161 | -ac_try="$ac_cpp conftest.$ac_ext >conftest.out 2>conftest.err" | |
162 | -AC_TRY_EVAL(ac_try) | |
163 | -ac_err=`grep -v '^ *+' conftest.err | grep -v "^conftest.${ac_ext}\$"` | |
164 | -if test -z "$ac_err"; then | |
165 | - ifelse([$2], , :, [rm -rf conftest* | |
166 | - $2]) | |
167 | -else | |
168 | - echo "$ac_err" >&AC_FD_CC | |
169 | - echo "configure: failed program was:" >&AC_FD_CC | |
170 | - cat conftest.$ac_ext >&AC_FD_CC | |
171 | -ifelse([$3], , , [ rm -rf conftest* | |
172 | - $3 | |
173 | -])dnl | |
174 | -fi | |
175 | -rm -f conftest*]) | |
176 | - | |
177 | - | |
178 | -dnl | |
179 | -dnl Require finding the C or C++ preprocessor, whichever is the | |
180 | -dnl current language. | |
181 | -dnl ------------------------------------------------------------- | |
182 | -AC_DEFUN(DX_REQUIRE_CPP, | |
183 | -[ifelse(AC_LANG, C, [AC_REQUIRE([DX_PROG_CPP])], [AC_REQUIRE([DX_PROG_CXXCPP])])]) | |
184 | - | |
185 | -AC_DEFUN(DX_PROG_CXXCPP, | |
186 | -[AC_MSG_CHECKING(how to run the C++ preprocessor) | |
187 | -if test -z "$CXXCPP"; then | |
188 | -AC_CACHE_VAL(ac_cv_prog_CXXCPP, | |
189 | -[AC_LANG_SAVE[]dnl | |
190 | -AC_LANG_CPLUSPLUS[]dnl | |
191 | - CXXCPP="${CXX-g++} -E" | |
192 | - DX_TRY_CPP([#include <stdlib.h>], , CXXCPP=/lib/cpp) | |
193 | - ac_cv_prog_CXXCPP="$CXXCPP" | |
194 | -AC_LANG_RESTORE[]dnl | |
195 | -fi])dnl | |
196 | -CXXCPP="$ac_cv_prog_CXXCPP" | |
197 | -AC_MSG_RESULT($CXXCPP) | |
198 | -AC_SUBST(CXXCPP)dnl | |
199 | -]) | |
200 | - | |
201 | -AC_DEFUN(DX_PROG_CPP, | |
202 | -[AC_MSG_CHECKING(how to run the C preprocessor) | |
203 | -# On Suns, sometimes $CPP names a directory. | |
204 | -if test -n "$CPP" && test -d "$CPP"; then | |
205 | - CPP= | |
206 | -fi | |
207 | -if test -z "$CPP"; then | |
208 | -AC_CACHE_VAL(ac_cv_prog_CPP, | |
209 | -[ # This must be in double quotes, not single quotes, because CPP may get | |
210 | - # substituted into the Makefile and "${CC-cc}" will confuse make. | |
211 | - CPP="${CC-cc} -E" | |
212 | - # On the NeXT, cc -E runs the code through the compiler's parser, | |
213 | - # not just through cpp. | |
214 | -dnl Use a header file that comes with gcc, so configuring glibc | |
215 | -dnl with a fresh cross-compiler works. | |
216 | - DX_TRY_CPP([#include <assert.h> | |
217 | -Syntax Error], , | |
218 | - CPP="${CC-cc} -E -traditional-cpp" | |
219 | - DX_TRY_CPP([#include <assert.h> | |
220 | -Syntax Error], , | |
221 | - CPP="${CC-cc} -nologo -E" | |
222 | - DX_TRY_CPP([#include <assert.h> | |
223 | -Syntax Error], , CPP=/lib/cpp))) | |
224 | - ac_cv_prog_CPP="$CPP"])dnl | |
225 | - CPP="$ac_cv_prog_CPP" | |
226 | -else | |
227 | - ac_cv_prog_CPP="$CPP" | |
228 | -fi | |
229 | -AC_MSG_RESULT($CPP) | |
230 | -AC_SUBST(CPP)dnl | |
231 | -]) | |
232 | - | |
233 | - | |
234 | -dnl | |
235 | dnl Check whether using GNU C | |
236 | dnl ------------------------------------------------------------- | |
237 | AC_DEFUN(DX_PROG_CC_GNU, | |
238 | @@ -670,8 +531,8 @@ | |
239 | dnl ------------------------------------------------------------- | |
240 | AC_DEFUN(DX_CYGWIN_MOUNTS, | |
241 | [ | |
242 | - changequote(<<,>>)dnl | |
243 | AC_MSG_CHECKING(intelnt under cygwin) | |
244 | + changequote(%,%)dnl | |
245 | mnts="none" | |
246 | if test "$ARCH" = "intelnt" ; then | |
247 | tt=`uname -s | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` | |
248 | --- dx-4.1.0/acconfig.h.wiget Mon Jul 23 20:18:08 2001 | |
249 | +++ dx-4.1.0/acconfig.h Mon Jul 23 20:18:46 2001 | |
250 | @@ -43,6 +43,7 @@ | |
251 | #undef HAVE_LIBTIFF | |
252 | #undef HAVE_LIBTTF | |
253 | #undef HAVE_TT_FONT_PATH | |
254 | +#undef TT_FONT_PATH | |
255 | ||
256 | #undef __int64 | |
257 |