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
5 dnl Checks for programs.
16 if test -z "$EXEEXT" ; then
22 -if test "$CYGWIN" = yes || test "$MINGW32" = yes ; then
28 + *cygwin*) ANYDX=AnyDX.dll ;;
29 + *mingw32*) ANYDX=AnyDX.dll ;;
30 + *) ANYDX=libAnyDX.so ;;
38 AC_CHECK_LIB(gen, regex)
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 \
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
62 -dnl Check for the CYGWIN environment
63 -dnl -------------------------------------------------------------
65 -[AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
68 -#define __CYGWIN__ __CYGWIN32__
71 -ac_cv_cygwin=yes, ac_cv_cygwin=no)
74 -test "$ac_cv_cygwin" = yes && CYGWIN=yes])
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.
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
89 + *cygwin*) ac_cv_exeext=.exe ;;
90 + *mingw32*) ac_cv_exeext=.exe ;;
93 echo 'int main () { return 0; }' > conftest.$ac_ext
98 test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
103 test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
104 AC_MSG_RESULT(${ac_cv_exeext})
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
121 - ifelse([$2], , :, [$2])
124 -ifelse([$3], , , [$3
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,
137 -DX_CHECK_HEADER($ac_hdr,
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
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"
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"
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*
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*
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])])])
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,
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
196 -CXXCPP="$ac_cv_prog_CXXCPP"
197 -AC_MSG_RESULT($CXXCPP)
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
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.
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>
218 - CPP="${CC-cc} -E -traditional-cpp"
219 - DX_TRY_CPP([#include <assert.h>
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"
227 - ac_cv_prog_CPP="$CPP"
235 dnl Check whether using GNU C
236 dnl -------------------------------------------------------------
237 AC_DEFUN(DX_PROG_CC_GNU,
239 dnl -------------------------------------------------------------
240 AC_DEFUN(DX_CYGWIN_MOUNTS,
242 - changequote(<<,>>)dnl
243 AC_MSG_CHECKING(intelnt under cygwin)
244 + changequote(%,%)dnl
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
253 #undef HAVE_TT_FONT_PATH