changeset
Set version 1.6.1. Bootstrap.
Fri Oct 08 12:42:28 2004 +0000
- author
- Lars J. Aas <larsa@sim.no>
- date
- Fri Oct 08 12:42:28 2004 +0000
- changeset 495
- aabe3f43ac00
- parent 494
- dc3cf3c9907b
- child 496
- 9fc5e27a9fcb
Set version 1.6.1. Bootstrap.
| Makefile.in | file | annotate | diff | revisions | |
| aclocal.m4 | file | annotate | diff | revisions | |
| config.h.in | file | annotate | diff | revisions | |
| configure | file | annotate | diff | revisions | |
| configure.ac | file | annotate | diff | revisions | |
| guile/Makefile.in | file | annotate | diff | revisions | |
| mpeg2enc/Makefile.in | file | annotate | diff | revisions | |
| src/Makefile.in | file | annotate | diff | revisions |
1.1 --- a/Makefile.in Fri Oct 08 12:30:42 2004 +0000 1.2 +++ b/Makefile.in Fri Oct 08 12:42:28 2004 +0000 1.3 @@ -132,6 +132,10 @@ 1.4 STRIP = @STRIP@ 1.5 SUFFIX = @SUFFIX@ 1.6 VERSION = @VERSION@ 1.7 +X_CFLAGS = @X_CFLAGS@ 1.8 +X_EXTRA_LIBS = @X_EXTRA_LIBS@ 1.9 +X_LIBS = @X_LIBS@ 1.10 +X_PRE_LIBS = @X_PRE_LIBS@ 1.11 ac_compiler_gnu = @ac_compiler_gnu@ 1.12 ac_ct_AR = @ac_ct_AR@ 1.13 ac_ct_CC = @ac_ct_CC@
2.1 --- a/aclocal.m4 Fri Oct 08 12:30:42 2004 +0000 2.2 +++ b/aclocal.m4 Fri Oct 08 12:42:28 2004 +0000 2.3 @@ -7666,12 +7666,19 @@ 2.4 fi 2.5 2.6 if test x"$sim_ac_want_x11" = xno; then 2.7 - # Qt/X11 needs X11, which you need to enable by --enable-x11 2.8 + # Using Qt/X11 but option --enable-darwin-x11 not given 2.9 AC_TRY_LINK([#include <qapplication.h>], 2.10 [#if defined(__APPLE__) && defined(Q_WS_X11) 2.11 #error blah! 2.12 #endif],[], 2.13 - [SIM_AC_ERROR([x11-qt-on-mac])]) 2.14 + [SIM_AC_ERROR([x11-qt-but-no-x11-requested])]) 2.15 + else 2.16 + # --enable-darwin-x11 specified but attempting Qt/Mac linkage 2.17 + AC_TRY_LINK([#include <qapplication.h>], 2.18 + [#if defined(__APPLE__) && defined(Q_WS_MAC) 2.19 + #error blah! 2.20 + #endif],[], 2.21 + [SIM_AC_ERROR([mac-qt-but-x11-requested])]) 2.22 fi 2.23 ;; 2.24 esac 2.25 @@ -8167,19 +8174,35 @@ 2.26 fi 2.27 fi 2.28 2.29 + # On Mac OS X, GL is part of the optional X11 fraemwork 2.30 + case $host_os in 2.31 + darwin*) 2.32 + AC_REQUIRE([SIM_AC_CHECK_X11]) 2.33 + if test x$sim_ac_enable_darwin_x11 = xtrue; then 2.34 + sim_ac_gl_darwin_x11=/usr/X11R6 2.35 + if test -d $sim_ac_gl_darwin_x11; then 2.36 + sim_ac_gl_cppflags=-I$sim_ac_gl_darwin_x11/include 2.37 + fi 2.38 + fi 2.39 + ;; 2.40 + esac 2.41 + 2.42 CPPFLAGS="$CPPFLAGS $sim_ac_gl_cppflags" 2.43 2.44 - SIM_AC_CHECK_HEADER_SILENT([OpenGL/gl.h], [ 2.45 - sim_ac_gl_header_avail=true 2.46 - sim_ac_gl_header=OpenGL/gl.h 2.47 - AC_DEFINE([HAVE_OPENGL_GL_H], 1, [define if the GL header should be included as OpenGL/gl.h]) 2.48 - ], [ 2.49 + # Mac OS X framework (no X11, -framework OpenGL) 2.50 + if test x$sim_ac_enable_darwin_x11 = xfalse; then 2.51 + SIM_AC_CHECK_HEADER_SILENT([OpenGL/gl.h], [ 2.52 + sim_ac_gl_header_avail=true 2.53 + sim_ac_gl_header=OpenGL/gl.h 2.54 + AC_DEFINE([HAVE_OPENGL_GL_H], 1, [define if the GL header should be included as OpenGL/gl.h]) 2.55 + ]) 2.56 + else 2.57 SIM_AC_CHECK_HEADER_SILENT([GL/gl.h], [ 2.58 sim_ac_gl_header_avail=true 2.59 sim_ac_gl_header=GL/gl.h 2.60 AC_DEFINE([HAVE_GL_GL_H], 1, [define if the GL header should be included as GL/gl.h]) 2.61 ]) 2.62 - ]) 2.63 + fi 2.64 2.65 CPPFLAGS="$sim_ac_gl_save_CPPFLAGS" 2.66 if $sim_ac_gl_header_avail; then 2.67 @@ -8224,20 +8247,36 @@ 2.68 fi 2.69 fi 2.70 2.71 + # On Mac OS X, GL is part of the optional X11 fraemwork 2.72 + case $host_os in 2.73 + darwin*) 2.74 + AC_REQUIRE([SIM_AC_CHECK_X11]) 2.75 + if test x$sim_ac_enable_darwin_x11 = xtrue; then 2.76 + sim_ac_gl_darwin_x11=/usr/X11R6 2.77 + if test -d $sim_ac_gl_darwin_x11; then 2.78 + sim_ac_gl_cppflags=-I$sim_ac_gl_darwin_x11/include 2.79 + fi 2.80 + fi 2.81 + ;; 2.82 + esac 2.83 + 2.84 CPPFLAGS="$CPPFLAGS $sim_ac_glu_cppflags" 2.85 2.86 - SIM_AC_CHECK_HEADER_SILENT([OpenGL/glu.h], [ 2.87 - sim_ac_glu_header_avail=true 2.88 - sim_ac_glu_header=OpenGL/glu.h 2.89 - AC_DEFINE([HAVE_OPENGL_GLU_H], 1, [define if the GLU header should be included as OpenGL/glu.h]) 2.90 - ], [ 2.91 + # Mac OS X framework (no X11, -framework OpenGL) 2.92 + if test x$sim_ac_enable_darwin_x11 = xfalse; then 2.93 + SIM_AC_CHECK_HEADER_SILENT([OpenGL/glu.h], [ 2.94 + sim_ac_glu_header_avail=true 2.95 + sim_ac_glu_header=OpenGL/glu.h 2.96 + AC_DEFINE([HAVE_OPENGL_GLU_H], 1, [define if the GLU header should be included as OpenGL/glu.h]) 2.97 + ]) 2.98 + else 2.99 SIM_AC_CHECK_HEADER_SILENT([GL/glu.h], [ 2.100 sim_ac_glu_header_avail=true 2.101 sim_ac_glu_header=GL/glu.h 2.102 AC_DEFINE([HAVE_GL_GLU_H], 1, [define if the GLU header should be included as GL/glu.h]) 2.103 ]) 2.104 - ]) 2.105 - 2.106 + fi 2.107 + 2.108 CPPFLAGS="$sim_ac_glu_save_CPPFLAGS" 2.109 if $sim_ac_glu_header_avail; then 2.110 if test x"$sim_ac_glu_cppflags" = x""; then 2.111 @@ -8281,19 +8320,35 @@ 2.112 fi 2.113 fi 2.114 2.115 + # On Mac OS X, GL is part of the optional X11 fraemwork 2.116 + case $host_os in 2.117 + darwin*) 2.118 + AC_REQUIRE([SIM_AC_CHECK_X11]) 2.119 + if test x$sim_ac_enable_darwin_x11 = xtrue; then 2.120 + sim_ac_gl_darwin_x11=/usr/X11R6 2.121 + if test -d $sim_ac_gl_darwin_x11; then 2.122 + sim_ac_gl_cppflags=-I$sim_ac_gl_darwin_x11/include 2.123 + fi 2.124 + fi 2.125 + ;; 2.126 + esac 2.127 + 2.128 CPPFLAGS="$CPPFLAGS $sim_ac_glext_cppflags" 2.129 2.130 - SIM_AC_CHECK_HEADER_SILENT([OpenGL/glext.h], [ 2.131 - sim_ac_glext_header_avail=true 2.132 - sim_ac_glext_header=OpenGL/glext.h 2.133 - AC_DEFINE([HAVE_OPENGL_GLEXT_H], 1, [define if the GLEXT header should be included as OpenGL/glext.h]) 2.134 - ], [ 2.135 - SIM_AC_CHECK_HEADER_SILENT([GL/gl.h], [ 2.136 + # Mac OS X framework (no X11, -framework OpenGL) 2.137 + if test x$sim_ac_enable_darwin_x11 = xfalse; then 2.138 + SIM_AC_CHECK_HEADER_SILENT([OpenGL/glext.h], [ 2.139 + sim_ac_glext_header_avail=true 2.140 + sim_ac_glext_header=OpenGL/glext.h 2.141 + AC_DEFINE([HAVE_OPENGL_GLEXT_H], 1, [define if the GLEXT header should be included as OpenGL/glext.h]) 2.142 + ]) 2.143 + else 2.144 + SIM_AC_CHECK_HEADER_SILENT([GL/glext.h], [ 2.145 sim_ac_glext_header_avail=true 2.146 sim_ac_glext_header=GL/glext.h 2.147 AC_DEFINE([HAVE_GL_GLEXT_H], 1, [define if the GLEXT header should be included as GL/glext.h]) 2.148 ]) 2.149 - ]) 2.150 + fi 2.151 2.152 CPPFLAGS="$sim_ac_glext_save_CPPFLAGS" 2.153 if $sim_ac_glext_header_avail; then 2.154 @@ -8380,8 +8435,16 @@ 2.155 sim_ac_use_framework_option=false; 2.156 case $host_os in 2.157 darwin*) 2.158 - if test x"$GCC" = x"yes"; then 2.159 + AC_REQUIRE([SIM_AC_CHECK_X11]) 2.160 + if test x"$GCC" = x"yes" -a x$sim_ac_enable_darwin_x11 = xfalse; then 2.161 SIM_AC_CC_COMPILER_OPTION([-framework OpenGL], [sim_ac_use_framework_option=true]) 2.162 + else 2.163 + # On Mac OS X, OpenGL is installed as part of the optional X11 SDK. 2.164 + sim_ac_gl_darwin_x11=/usr/X11R6 2.165 + if test -d $sim_ac_gl_darwin_x11; then 2.166 + sim_ac_ogl_cppflags=-I$sim_ac_gl_darwin_x11/include 2.167 + sim_ac_ogl_ldflags=-L$sim_ac_gl_darwin_x11/lib 2.168 + fi 2.169 fi 2.170 ;; 2.171 esac 2.172 @@ -8864,6 +8927,459 @@ 2.173 ]) 2.174 2.175 2.176 +# Usage: 2.177 +# SIM_AC_CHECK_X11([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.178 +# 2.179 +# Try to find the X11 development system. If it is found, these 2.180 +# shell variables are set: 2.181 +# 2.182 +# $sim_ac_x11_cppflags (extra flags the compiler needs for X11) 2.183 +# $sim_ac_x11_ldflags (extra flags the linker needs for X11) 2.184 +# $sim_ac_x11_libs (link libraries the linker needs for X11) 2.185 +# 2.186 +# The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly. 2.187 +# In addition, the variable $sim_ac_x11_avail is set to "yes" if 2.188 +# the X11 development system is found. 2.189 +# 2.190 +# 2.191 +# Author: Morten Eriksen, <mortene@sim.no>. 2.192 + 2.193 +AC_DEFUN([SIM_AC_CHECK_X11], [ 2.194 +AC_REQUIRE([AC_PATH_XTRA]) 2.195 + 2.196 +sim_ac_enable_darwin_x11=true 2.197 + 2.198 +case $host_os in 2.199 + darwin* ) 2.200 + AC_ARG_ENABLE([darwin-x11], 2.201 + AC_HELP_STRING([--enable-darwin-x11], 2.202 + [enable X11 on Darwin [[default=--disable-darwin-x11]]]), 2.203 + [case "${enableval}" in 2.204 + yes | true) sim_ac_enable_darwin_x11=true ;; 2.205 + no | false) sim_ac_enable_darwin_x11=false ;; 2.206 + *) SIM_AC_ENABLE_ERROR([--enable-darwin-x11]) ;; 2.207 + esac], 2.208 + [sim_ac_enable_darwin_x11=false]) 2.209 + ;; 2.210 +esac 2.211 + 2.212 +sim_ac_x11_avail=no 2.213 + 2.214 +if test x"$no_x" != xyes -a x"$sim_ac_enable_darwin_x11" = xtrue; then 2.215 + # *** DEBUG *** 2.216 + # Keep this around, as it can be handy when testing on new systems. 2.217 + # echo "X_CFLAGS: $X_CFLAGS" 2.218 + # echo "X_PRE_LIBS: $X_PRE_LIBS" 2.219 + # echo "X_LIBS: $X_LIBS" 2.220 + # echo "X_EXTRA_LIBS: $X_EXTRA_LIBS" 2.221 + # echo 2.222 + # exit 0 2.223 + 2.224 + sim_ac_x11_cppflags="$X_CFLAGS" 2.225 + sim_ac_x11_ldflags="$X_LIBS" 2.226 + sim_ac_x11_libs="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" 2.227 + 2.228 + sim_ac_save_cppflags=$CPPFLAGS 2.229 + sim_ac_save_ldflags=$LDFLAGS 2.230 + sim_ac_save_libs=$LIBS 2.231 + 2.232 + CPPFLAGS="$CPPFLAGS $sim_ac_x11_cppflags" 2.233 + LDFLAGS="$LDFLAGS $sim_ac_x11_ldflags" 2.234 + LIBS="$sim_ac_x11_libs $LIBS" 2.235 + 2.236 + AC_CACHE_CHECK( 2.237 + [whether we can link against X11], 2.238 + sim_cv_lib_x11_avail, 2.239 + [AC_TRY_LINK([#include <X11/Xlib.h>], 2.240 + [(void)XOpenDisplay(0L);], 2.241 + [sim_cv_lib_x11_avail=yes], 2.242 + [sim_cv_lib_x11_avail=no])]) 2.243 + 2.244 + if test x"$sim_cv_lib_x11_avail" = x"yes"; then 2.245 + sim_ac_x11_avail=yes 2.246 + $1 2.247 + else 2.248 + CPPFLAGS=$sim_ac_save_cppflags 2.249 + LDFLAGS=$sim_ac_save_ldflags 2.250 + LIBS=$sim_ac_save_libs 2.251 + $2 2.252 + fi 2.253 +fi 2.254 +]) 2.255 + 2.256 +# Usage: 2.257 +# SIM_AC_CHECK_X11SHMEM([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.258 +# 2.259 +# Try to find the X11 shared memory extension. If it is found, this 2.260 +# shell variable is set: 2.261 +# 2.262 +# $sim_ac_x11shmem_libs (link libraries the linker needs for X11 Shm) 2.263 +# 2.264 +# The LIBS flag will also be modified accordingly. In addition, the 2.265 +# variable $sim_ac_x11shmem_avail is set to "yes" if the X11 shared 2.266 +# memory extension is found. 2.267 +# 2.268 +# 2.269 +# Author: Morten Eriksen, <mortene@sim.no>. 2.270 +# 2.271 +# TODO: 2.272 +# * [mortene:20000122] make sure this work on MSWin (with 2.273 +# Cygwin installation) 2.274 +# 2.275 + 2.276 +AC_DEFUN([SIM_AC_CHECK_X11SHMEM], [ 2.277 + 2.278 +sim_ac_x11shmem_avail=no 2.279 +sim_ac_x11shmem_libs="-lXext" 2.280 +sim_ac_save_libs=$LIBS 2.281 +LIBS="$sim_ac_x11shmem_libs $LIBS" 2.282 + 2.283 +AC_CACHE_CHECK( 2.284 + [whether the X11 shared memory extension is available], 2.285 + sim_cv_lib_x11shmem_avail, 2.286 + [AC_TRY_LINK([#include <X11/Xlib.h> 2.287 + #include <X11/extensions/XShm.h>], 2.288 + [(void)XShmQueryVersion(0L, 0L, 0L, 0L);], 2.289 + [sim_cv_lib_x11shmem_avail=yes], 2.290 + [sim_cv_lib_x11shmem_avail=no])]) 2.291 + 2.292 +if test x"$sim_cv_lib_x11shmem_avail" = xyes; then 2.293 + sim_ac_x11shmem_avail=yes 2.294 + $1 2.295 +else 2.296 + LIBS=$sim_ac_save_libs 2.297 + $2 2.298 +fi 2.299 +]) 2.300 + 2.301 +# Usage: 2.302 +# SIM_AC_CHECK_X11MU([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.303 +# 2.304 +# Try to find the X11 miscellaneous utilities extension. If it is 2.305 +# found, this shell variable is set: 2.306 +# 2.307 +# $sim_ac_x11mu_libs (link libraries the linker needs for X11 MU) 2.308 +# 2.309 +# The LIBS flag will also be modified accordingly. In addition, the 2.310 +# variable $sim_ac_x11mu_avail is set to "yes" if the X11 miscellaneous 2.311 +# utilities extension is found. 2.312 +# CPPFLAGS and LDFLAGS might also be modified, if library is found in a 2.313 +# non-standard location. 2.314 +# 2.315 +# Author: Morten Eriksen, <mortene@sim.no>. 2.316 +# 2.317 +# TODO: 2.318 +# * [mortene:20000122] make sure this work on MSWin (with 2.319 +# Cygwin installation) 2.320 + 2.321 +AC_DEFUN([SIM_AC_CHECK_X11MU], [ 2.322 + 2.323 +sim_ac_x11mu_avail=no 2.324 +sim_ac_x11mu_cppflags="" 2.325 +sim_ac_x11mu_ldflags="" 2.326 +sim_ac_x11mu_libs="-lXmu" 2.327 + 2.328 +sim_ac_save_libs=$LIBS 2.329 +sim_ac_save_cppflags=$CPPFLAGS 2.330 +sim_ac_save_ldflags=$LDFLAGS 2.331 + 2.332 +LIBS="$sim_ac_x11mu_libs $LIBS" 2.333 + 2.334 +AC_CACHE_CHECK( 2.335 + [whether the X11 miscellaneous utilities library is available], 2.336 + sim_cv_lib_x11mu_avail, 2.337 + [AC_TRY_LINK([#include <X11/Xlib.h> 2.338 + #include <X11/Xmu/Xmu.h> 2.339 + #include <X11/Xmu/StdCmap.h>], 2.340 + [(void)XmuAllStandardColormaps(0L);], 2.341 + [sim_cv_lib_x11mu_avail=yes], 2.342 + [sim_cv_lib_x11mu_avail=maybe])]) 2.343 + 2.344 +if test x"$sim_cv_lib_x11mu_avail" = xyes; then 2.345 + sim_ac_x11mu_avail=yes 2.346 +else 2.347 + # On HP-UX, Xmu might be located under /usr/contrib/X11R6/ 2.348 + mudir=/usr/contrib/X11R6 2.349 + if test -d $mudir; then 2.350 + sim_ac_x11mu_cppflags="-I$mudir/include" 2.351 + sim_ac_x11mu_ldflags="-L$mudir/lib" 2.352 + CPPFLAGS="$sim_ac_x11mu_cppflags $CPPFLAGS" 2.353 + LDFLAGS="$sim_ac_x11mu_ldflags $LDFLAGS" 2.354 + 2.355 + AC_CACHE_CHECK( 2.356 + [once more whether the X11 miscellaneous utilities library is available], 2.357 + sim_cv_lib_x11mu_contrib_avail, 2.358 + [AC_TRY_LINK([#include <X11/Xlib.h> 2.359 + #include <X11/Xmu/Xmu.h> 2.360 + #include <X11/Xmu/StdCmap.h>], 2.361 + [(void)XmuAllStandardColormaps(0L);], 2.362 + [sim_cv_lib_x11mu_contrib_avail=yes], 2.363 + [sim_cv_lib_x11mu_contrib_avail=no])]) 2.364 + if test x"$sim_cv_lib_x11mu_contrib_avail" = xyes; then 2.365 + sim_ac_x11mu_avail=yes 2.366 + else 2.367 + sim_ac_x11mu_cppflags="" 2.368 + sim_ac_x11mu_ldflags="" 2.369 + fi 2.370 + fi 2.371 +fi 2.372 + 2.373 +if test x"$sim_ac_x11mu_avail" = xyes; then 2.374 + : 2.375 + $1 2.376 +else 2.377 + LIBS=$sim_ac_save_libs 2.378 + CPPFLAGS=$sim_ac_save_cppflags 2.379 + LDFLAGS=$sim_ac_save_ldflags 2.380 + $2 2.381 +fi 2.382 +]) 2.383 + 2.384 +# Usage: 2.385 +# SIM_AC_CHECK_X11XID([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.386 +# 2.387 +# Try to find the X11 extension device library. Sets this 2.388 +# shell variable: 2.389 +# 2.390 +# $sim_ac_x11xid_libs (link libraries the linker needs for X11 XID) 2.391 +# 2.392 +# The LIBS flag will also be modified accordingly. In addition, the 2.393 +# variable $sim_ac_x11xid_avail is set to "yes" if the X11 extension 2.394 +# device library is found. 2.395 +# 2.396 +# Author: Morten Eriksen, <mortene@sim.no>. 2.397 +# 2.398 +# TODO: 2.399 +# * [mortene:20000122] make sure this work on MSWin (with 2.400 +# Cygwin installation) 2.401 +# 2.402 + 2.403 +AC_DEFUN([SIM_AC_CHECK_X11XID], [ 2.404 + 2.405 +sim_ac_x11xid_avail=no 2.406 +sim_ac_x11xid_libs="-lXi" 2.407 +sim_ac_save_libs=$LIBS 2.408 +LIBS="$sim_ac_x11xid_libs $LIBS" 2.409 + 2.410 +AC_CACHE_CHECK( 2.411 + [whether the X11 extension device library is available], 2.412 + sim_cv_lib_x11xid_avail, 2.413 + [AC_TRY_LINK([#include <X11/extensions/XInput.h>], 2.414 + [(void)XOpenDevice(0L, 0);], 2.415 + [sim_cv_lib_x11xid_avail=yes], 2.416 + [sim_cv_lib_x11xid_avail=no])]) 2.417 + 2.418 +if test x"$sim_cv_lib_x11xid_avail" = x"yes"; then 2.419 + sim_ac_x11xid_avail=yes 2.420 + $1 2.421 +else 2.422 + LIBS=$sim_ac_save_libs 2.423 + $2 2.424 +fi 2.425 +]) 2.426 + 2.427 +# Usage: 2.428 +# SIM_AC_CHECK_X_INTRINSIC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.429 +# 2.430 +# Try to find the Xt intrinsic library. Sets this shell variable: 2.431 +# 2.432 +# $sim_ac_xt_libs (link library the linker needs for X Intrinsic) 2.433 +# 2.434 +# The LIBS flag will also be modified accordingly. In addition, the 2.435 +# variable $sim_ac_xt_avail is set to "yes" if the X11 Intrinsic 2.436 +# library is found. 2.437 +# 2.438 +# Author: Morten Eriksen, <mortene@sim.no>. 2.439 +# 2.440 + 2.441 +AC_DEFUN([SIM_AC_CHECK_X_INTRINSIC], [ 2.442 + 2.443 +sim_ac_xt_avail=no 2.444 +sim_ac_xt_libs="-lXt" 2.445 +sim_ac_save_libs=$LIBS 2.446 +LIBS="$sim_ac_xt_libs $LIBS" 2.447 + 2.448 +AC_CACHE_CHECK( 2.449 + [whether the X11 Intrinsic library is available], 2.450 + sim_cv_lib_xt_avail, 2.451 + [AC_TRY_LINK([#include <X11/Intrinsic.h>], 2.452 + [(void)XtVaCreateWidget("", 0L, 0L);], 2.453 + [sim_cv_lib_xt_avail=yes], 2.454 + [sim_cv_lib_xt_avail=no])]) 2.455 + 2.456 +if test x"$sim_cv_lib_xt_avail" = xyes; then 2.457 + sim_ac_xt_avail=yes 2.458 + $1 2.459 +else 2.460 + LIBS=$sim_ac_save_libs 2.461 + $2 2.462 +fi 2.463 +]) 2.464 + 2.465 +# Usage: 2.466 +# SIM_AC_CHECK_LIBXPM( [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] ) 2.467 +# 2.468 +# Description: 2.469 +# This macro checks for libXpm. 2.470 +# 2.471 +# Variables: 2.472 +# $sim_ac_xpm_avail yes | no 2.473 +# $sim_ac_xpm_libs [link-line libraries] 2.474 +# 2.475 +# Authors: 2.476 +# Lars J. Aas <larsa@sim.no> 2.477 +# 2.478 + 2.479 +AC_DEFUN([SIM_AC_CHECK_LIBXPM], [ 2.480 + 2.481 +sim_ac_xpm_avail=no 2.482 +sim_ac_xpm_libs="-lXpm" 2.483 + 2.484 +AC_CACHE_CHECK( 2.485 + [whether libXpm is available], 2.486 + sim_cv_lib_xpm_avail, 2.487 + [sim_ac_save_libs=$LIBS 2.488 + LIBS="$sim_ac_xpm_libs $LIBS" 2.489 + AC_TRY_LINK([#include <X11/xpm.h>], 2.490 + [(void)XpmLibraryVersion();], 2.491 + [sim_cv_lib_xpm_avail=yes], 2.492 + [sim_cv_lib_xpm_avail=no]) 2.493 + LIBS="$sim_ac_save_libs"]) 2.494 + 2.495 +if test x"$sim_cv_lib_xpm_avail" = x"yes"; then 2.496 + sim_ac_xpm_avail=yes 2.497 + LIBS="$sim_ac_xpm_libs $LIBS" 2.498 + $1 2.499 +else 2.500 + ifelse([$2], , :, [$2]) 2.501 +fi 2.502 +]) 2.503 + 2.504 + 2.505 +# Usage: 2.506 +# SIM_AC_CHECK_X11_XP([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) 2.507 +# 2.508 +# Try to find the Xp library for printing functionality. Sets this 2.509 +# shell variable: 2.510 +# 2.511 +# $sim_ac_xp_libs (link library the linker needs for the Xp library) 2.512 +# 2.513 +# The LIBS flag will also be modified accordingly. In addition, the 2.514 +# variable $sim_ac_xp_avail is set to "yes" if the Xp library is found. 2.515 +# 2.516 +# Author: Morten Eriksen, <mortene@sim.no>. 2.517 +# 2.518 + 2.519 +AC_DEFUN([SIM_AC_CHECK_X11_XP], [ 2.520 +sim_ac_xp_avail=no 2.521 +sim_ac_xp_libs="-lXp" 2.522 +sim_ac_save_libs=$LIBS 2.523 +LIBS="$sim_ac_xp_libs $LIBS" 2.524 + 2.525 +AC_CACHE_CHECK( 2.526 + [whether the X11 printing library is available], 2.527 + sim_cv_lib_xp_avail, 2.528 + [AC_TRY_LINK([#include <X11/extensions/Print.h>], 2.529 + [XpEndJob(0L);], 2.530 + [sim_cv_lib_xp_avail=yes], 2.531 + [sim_cv_lib_xp_avail=no])]) 2.532 + 2.533 +if test x"$sim_cv_lib_xp_avail" = xyes; then 2.534 + sim_ac_xp_avail=yes 2.535 + $1 2.536 +else 2.537 + LIBS=$sim_ac_save_libs 2.538 + $2 2.539 +fi 2.540 +]) 2.541 + 2.542 +# SIM_AC_CHECK_X11_ATHENA( [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] ) 2.543 + 2.544 +AC_DEFUN([SIM_AC_CHECK_X11_ATHENA], [ 2.545 +sim_ac_athena_avail=no 2.546 +sim_ac_athena_libs="-lXaw" 2.547 +sim_ac_save_libs=$LIBS 2.548 +LIBS="$sim_ac_athena_libs $LIBS" 2.549 + 2.550 +AC_CACHE_CHECK( 2.551 + [whether the X11 Athena widgets library is available], 2.552 + sim_cv_lib_athena_avail, 2.553 + [AC_TRY_LINK([#include <X11/Xfuncproto.h> 2.554 + #include <X11/Xaw/XawInit.h>], 2.555 + [XawInitializeWidgetSet();], 2.556 + [sim_cv_lib_athena_avail=yes], 2.557 + [sim_cv_lib_athena_avail=no])]) 2.558 + 2.559 +if test x"$sim_cv_lib_athena_avail" = xyes; then 2.560 + sim_ac_athena_avail=yes 2.561 + $1 2.562 +else 2.563 + LIBS=$sim_ac_save_libs 2.564 + $2 2.565 +fi 2.566 +]) 2.567 + 2.568 +# SIM_AC_X11_READY( [ACTION-IF-TRUE], [ACTION-IF-FALSE] ) 2.569 + 2.570 +AC_DEFUN([SIM_AC_CHECK_X11_READY], 2.571 +[AC_CACHE_CHECK( 2.572 + [if X11 linkage is ready], 2.573 + [sim_cv_x11_ready], 2.574 + [AC_TRY_LINK( 2.575 + [#include <X11/Xlib.h>], 2.576 + [(void)XOpenDisplay(0L);], 2.577 + [sim_cv_x11_ready=true], 2.578 + [sim_cv_x11_ready=false])]) 2.579 +if ${sim_cv_x11_ready}; then 2.580 + ifelse([$1], , :, [$1]) 2.581 +else 2.582 + ifelse([$2], , :, [$2]) 2.583 +fi 2.584 +]) # SIM_AC_X11_READY() 2.585 + 2.586 + 2.587 +# ************************************************************************** 2.588 + 2.589 +AC_DEFUN([SIM_AC_HAVE_LIBX11_IFELSE], [ 2.590 +: ${sim_ac_have_libx11=false} 2.591 +AC_REQUIRE([AC_PATH_X]) 2.592 + 2.593 +# prevent multiple runs 2.594 +$sim_ac_have_libx11 || { 2.595 + if test x"$no_x" != xyes; then 2.596 + sim_ac_libx11_cppflags= 2.597 + sim_ac_libx11_ldflags= 2.598 + test x"$x_includes" != x && sim_ac_libx11_cppflags="-I$x_includes" 2.599 + test x"$x_libraries" != x && sim_ac_libx11_ldflags="-L$x_libraries" 2.600 + sim_ac_libx11_libs="-lX11" 2.601 + 2.602 + sim_ac_libx11_save_cppflags=$CPPFLAGS 2.603 + sim_ac_libx11_save_ldflags=$LDFLAGS 2.604 + sim_ac_libx11_save_libs=$LIBS 2.605 + 2.606 + CPPFLAGS="$CPPFLAGS $sim_ac_libx11_cppflags" 2.607 + LDFLAGS="$LDFLAGS $sim_ac_libx11_ldflags" 2.608 + LIBS="$sim_ac_libx11_libs $LIBS" 2.609 + 2.610 + AC_TRY_LINK( 2.611 + [#include <X11/Xlib.h>], 2.612 + [(void)XOpenDisplay(0L);], 2.613 + [sim_ac_have_libx11=true]) 2.614 + 2.615 + CPPFLAGS=$sim_ac_libx11_save_cppflags 2.616 + LDFLAGS=$sim_ac_libx11_save_ldflags 2.617 + LIBS=$sim_ac_libx11_save_libs 2.618 + fi 2.619 +} 2.620 + 2.621 +if $sim_ac_have_libx11; then 2.622 + ifelse([$1], , :, [$1]) 2.623 +else 2.624 + ifelse([$2], , :, [$2]) 2.625 +fi 2.626 +]) # SIM_AC_HAVE_LIBX11_IFELSE 2.627 + 2.628 + 2.629 # Use this file to store miscellaneous macros related to checking 2.630 # compiler features. 2.631 2.632 @@ -9095,7 +9611,7 @@ 2.633 # ************************************************************************** 2.634 2.635 AC_DEFUN([SIM_AC_HAVE_LIBUNGIF_IFELSE], 2.636 -[AC_REQUIRE([AC_PATH_X]) 2.637 +[AC_REQUIRE([SIM_AC_CHECK_X11]) 2.638 : ${sim_ac_have_libungif=false} 2.639 AC_MSG_CHECKING([for libungif]) 2.640 AC_ARG_WITH(
3.1 --- a/config.h.in Fri Oct 08 12:30:42 2004 +0000 3.2 +++ b/config.h.in Fri Oct 08 12:42:28 2004 +0000 3.3 @@ -119,3 +119,6 @@ 3.4 3.5 /* Version number of package */ 3.6 #undef VERSION 3.7 + 3.8 +/* Define to 1 if the X Window System is missing or not being used. */ 3.9 +#undef X_DISPLAY_MISSING
4.1 --- a/configure Fri Oct 08 12:30:42 2004 +0000 4.2 +++ b/configure Fri Oct 08 12:42:28 2004 +0000 4.3 @@ -1,6 +1,6 @@ 4.4 #! /bin/sh 4.5 # Guess values for system-dependent variables and create Makefiles. 4.6 -# Generated by GNU Autoconf 2.57 for simage 1.6.1a. 4.7 +# Generated by GNU Autoconf 2.57 for simage 1.6.1. 4.8 # 4.9 # Report bugs to <coin-bugs@coin3d.org>. 4.10 # 4.11 @@ -422,8 +422,8 @@ 4.12 # Identity of this package. 4.13 PACKAGE_NAME='simage' 4.14 PACKAGE_TARNAME='simage' 4.15 -PACKAGE_VERSION='1.6.1a' 4.16 -PACKAGE_STRING='simage 1.6.1a' 4.17 +PACKAGE_VERSION='1.6.1' 4.18 +PACKAGE_STRING='simage 1.6.1' 4.19 PACKAGE_BUGREPORT='coin-bugs@coin3d.org' 4.20 4.21 ac_unique_file="src/simage.c" 4.22 @@ -464,7 +464,7 @@ 4.23 # include <unistd.h> 4.24 #endif" 4.25 4.26 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os BUILD_WITH_MSVC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIMAGE_MAJOR_VERSION SIMAGE_MINOR_VERSION SIMAGE_MICRO_VERSION SIMAGE_VERSION LT_CURRENT LT_REVISION LT_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL MACOSX_TRUE MACOSX_FALSE MACOSX_10_2FF_TRUE MACOSX_10_2FF_FALSE SIMAGE_EXTRA_CPPFLAGS SIMAGE_EXTRA_CFLAGS SIMAGE_EXTRA_LDFLAGS SIMAGE_EXTRA_LIBS DSUFFIX CONFIG SUFFIX sim_ac_qt_cygpath SIMAGE_QIMAGE_SUPPORT_TRUE SIMAGE_QIMAGE_SUPPORT_FALSE SIMAGE_QUICKTIME_SUPPORT_TRUE SIMAGE_QUICKTIME_SUPPORT_FALSE SIMAGE_MPEG2ENC_SUPPORT_TRUE SIMAGE_MPEG2ENC_SUPPORT_FALSE SIMAGE_DEBUG_BUILD SIMAGE_DEBUG_BUILD_TRUE SIMAGE_DEBUG_BUILD_FALSE GUILE_PROG HAVE_GUILE_TRUE HAVE_GUILE_FALSE LIBFLAGS BUILD_WITH_MSVC_TRUE BUILD_WITH_MSVC_FALSE win_includedir win_libdir win_srcdir simage_configure_date COIN_COMPILER ac_compiler_gnu simage_src_dir SIMAGE_DSP_LIBS SIMAGE_DSP_INCS SIMAGE_DSP_DEFS LIBOBJS LTLIBOBJS' 4.27 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os BUILD_WITH_MSVC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIMAGE_MAJOR_VERSION SIMAGE_MINOR_VERSION SIMAGE_MICRO_VERSION SIMAGE_VERSION LT_CURRENT LT_REVISION LT_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL MACOSX_TRUE MACOSX_FALSE MACOSX_10_2FF_TRUE MACOSX_10_2FF_FALSE SIMAGE_EXTRA_CPPFLAGS SIMAGE_EXTRA_CFLAGS SIMAGE_EXTRA_LDFLAGS SIMAGE_EXTRA_LIBS DSUFFIX CONFIG SUFFIX sim_ac_qt_cygpath SIMAGE_QIMAGE_SUPPORT_TRUE SIMAGE_QIMAGE_SUPPORT_FALSE SIMAGE_QUICKTIME_SUPPORT_TRUE SIMAGE_QUICKTIME_SUPPORT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SIMAGE_MPEG2ENC_SUPPORT_TRUE SIMAGE_MPEG2ENC_SUPPORT_FALSE SIMAGE_DEBUG_BUILD SIMAGE_DEBUG_BUILD_TRUE SIMAGE_DEBUG_BUILD_FALSE GUILE_PROG HAVE_GUILE_TRUE HAVE_GUILE_FALSE LIBFLAGS BUILD_WITH_MSVC_TRUE BUILD_WITH_MSVC_FALSE win_includedir win_libdir win_srcdir simage_configure_date COIN_COMPILER ac_compiler_gnu simage_src_dir SIMAGE_DSP_LIBS SIMAGE_DSP_INCS SIMAGE_DSP_DEFS LIBOBJS LTLIBOBJS' 4.28 ac_subst_files='' 4.29 4.30 # Initialize some variables set by options. 4.31 @@ -953,7 +953,7 @@ 4.32 # Omit some internal or obsolete options to make the list less imposing. 4.33 # This message is too long to be a string in the A/UX 3.1 sh. 4.34 cat <<_ACEOF 4.35 -\`configure' configures simage 1.6.1a to adapt to many kinds of systems. 4.36 +\`configure' configures simage 1.6.1 to adapt to many kinds of systems. 4.37 4.38 Usage: $0 [OPTION]... [VAR=VALUE]... 4.39 4.40 @@ -1024,7 +1024,7 @@ 4.41 4.42 if test -n "$ac_init_help"; then 4.43 case $ac_init_help in 4.44 - short | recursive ) echo "Configuration of simage 1.6.1a:";; 4.45 + short | recursive ) echo "Configuration of simage 1.6.1:";; 4.46 esac 4.47 cat <<\_ACEOF 4.48 4.49 @@ -1049,6 +1049,8 @@ 4.50 --enable-debug compile in debug mode [default=yes] 4.51 --enable-symbols include symbol debug information [default=yes] 4.52 --enable-qt-debug win32: link with debug versions of Qt libraries 4.53 + --enable-darwin-x11 enable X11 on Darwin 4.54 + [default=--disable-darwin-x11] 4.55 4.56 Optional Packages: 4.57 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 4.58 @@ -1161,7 +1163,7 @@ 4.59 test -n "$ac_init_help" && exit 0 4.60 if $ac_init_version; then 4.61 cat <<\_ACEOF 4.62 -simage configure 1.6.1a 4.63 +simage configure 1.6.1 4.64 generated by GNU Autoconf 2.57 4.65 4.66 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 4.67 @@ -1176,7 +1178,7 @@ 4.68 This file contains any messages produced by compilers while 4.69 running configure, to aid debugging if configure makes a mistake. 4.70 4.71 -It was created by simage $as_me 1.6.1a, which was 4.72 +It was created by simage $as_me 1.6.1, which was 4.73 generated by GNU Autoconf 2.57. Invocation command line was 4.74 4.75 $ $0 $@ 4.76 @@ -3699,7 +3701,7 @@ 4.77 4.78 SIMAGE_MICRO_VERSION=1 4.79 4.80 -SIMAGE_VERSION=1.6.1a 4.81 +SIMAGE_VERSION=1.6.1 4.82 4.83 VERSION=$SIMAGE_VERSION 4.84 4.85 @@ -4975,7 +4977,7 @@ 4.86 ;; 4.87 *-*-irix6*) 4.88 # Find out which ABI we are using. 4.89 - echo '#line 4978 "configure"' > conftest.$ac_ext 4.90 + echo '#line 4980 "configure"' > conftest.$ac_ext 4.91 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4.92 (eval $ac_compile) 2>&5 4.93 ac_status=$? 4.94 @@ -5586,7 +5588,7 @@ 4.95 4.96 4.97 # Provide some information about the compiler. 4.98 -echo "$as_me:5589:" \ 4.99 +echo "$as_me:5591:" \ 4.100 "checking for Fortran 77 compiler version" >&5 4.101 ac_compiler=`set X $ac_compile; echo $2` 4.102 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 4.103 @@ -6597,11 +6599,11 @@ 4.104 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.105 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.106 -e 's:$: $lt_compiler_flag:'` 4.107 - (eval echo "\"\$as_me:6600: $lt_compile\"" >&5) 4.108 + (eval echo "\"\$as_me:6602: $lt_compile\"" >&5) 4.109 (eval "$lt_compile" 2>conftest.err) 4.110 ac_status=$? 4.111 cat conftest.err >&5 4.112 - echo "$as_me:6604: \$? = $ac_status" >&5 4.113 + echo "$as_me:6606: \$? = $ac_status" >&5 4.114 if (exit $ac_status) && test -s "$ac_outfile"; then 4.115 # The compiler can only warn and ignore the option if not recognized 4.116 # So say no if there are warnings 4.117 @@ -6829,11 +6831,11 @@ 4.118 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.119 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.120 -e 's:$: $lt_compiler_flag:'` 4.121 - (eval echo "\"\$as_me:6832: $lt_compile\"" >&5) 4.122 + (eval echo "\"\$as_me:6834: $lt_compile\"" >&5) 4.123 (eval "$lt_compile" 2>conftest.err) 4.124 ac_status=$? 4.125 cat conftest.err >&5 4.126 - echo "$as_me:6836: \$? = $ac_status" >&5 4.127 + echo "$as_me:6838: \$? = $ac_status" >&5 4.128 if (exit $ac_status) && test -s "$ac_outfile"; then 4.129 # The compiler can only warn and ignore the option if not recognized 4.130 # So say no if there are warnings 4.131 @@ -6896,11 +6898,11 @@ 4.132 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.133 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.134 -e 's:$: $lt_compiler_flag:'` 4.135 - (eval echo "\"\$as_me:6899: $lt_compile\"" >&5) 4.136 + (eval echo "\"\$as_me:6901: $lt_compile\"" >&5) 4.137 (eval "$lt_compile" 2>out/conftest.err) 4.138 ac_status=$? 4.139 cat out/conftest.err >&5 4.140 - echo "$as_me:6903: \$? = $ac_status" >&5 4.141 + echo "$as_me:6905: \$? = $ac_status" >&5 4.142 if (exit $ac_status) && test -s out/conftest2.$ac_objext 4.143 then 4.144 # The compiler can only warn and ignore the option if not recognized 4.145 @@ -8908,7 +8910,7 @@ 4.146 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.147 lt_status=$lt_dlunknown 4.148 cat > conftest.$ac_ext <<EOF 4.149 -#line 8911 "configure" 4.150 +#line 8913 "configure" 4.151 #include "confdefs.h" 4.152 4.153 #if HAVE_DLFCN_H 4.154 @@ -9006,7 +9008,7 @@ 4.155 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.156 lt_status=$lt_dlunknown 4.157 cat > conftest.$ac_ext <<EOF 4.158 -#line 9009 "configure" 4.159 +#line 9011 "configure" 4.160 #include "confdefs.h" 4.161 4.162 #if HAVE_DLFCN_H 4.163 @@ -11140,11 +11142,11 @@ 4.164 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.165 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.166 -e 's:$: $lt_compiler_flag:'` 4.167 - (eval echo "\"\$as_me:11143: $lt_compile\"" >&5) 4.168 + (eval echo "\"\$as_me:11145: $lt_compile\"" >&5) 4.169 (eval "$lt_compile" 2>conftest.err) 4.170 ac_status=$? 4.171 cat conftest.err >&5 4.172 - echo "$as_me:11147: \$? = $ac_status" >&5 4.173 + echo "$as_me:11149: \$? = $ac_status" >&5 4.174 if (exit $ac_status) && test -s "$ac_outfile"; then 4.175 # The compiler can only warn and ignore the option if not recognized 4.176 # So say no if there are warnings 4.177 @@ -11207,11 +11209,11 @@ 4.178 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.179 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.180 -e 's:$: $lt_compiler_flag:'` 4.181 - (eval echo "\"\$as_me:11210: $lt_compile\"" >&5) 4.182 + (eval echo "\"\$as_me:11212: $lt_compile\"" >&5) 4.183 (eval "$lt_compile" 2>out/conftest.err) 4.184 ac_status=$? 4.185 cat out/conftest.err >&5 4.186 - echo "$as_me:11214: \$? = $ac_status" >&5 4.187 + echo "$as_me:11216: \$? = $ac_status" >&5 4.188 if (exit $ac_status) && test -s out/conftest2.$ac_objext 4.189 then 4.190 # The compiler can only warn and ignore the option if not recognized 4.191 @@ -12450,7 +12452,7 @@ 4.192 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.193 lt_status=$lt_dlunknown 4.194 cat > conftest.$ac_ext <<EOF 4.195 -#line 12453 "configure" 4.196 +#line 12455 "configure" 4.197 #include "confdefs.h" 4.198 4.199 #if HAVE_DLFCN_H 4.200 @@ -12548,7 +12550,7 @@ 4.201 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.202 lt_status=$lt_dlunknown 4.203 cat > conftest.$ac_ext <<EOF 4.204 -#line 12551 "configure" 4.205 +#line 12553 "configure" 4.206 #include "confdefs.h" 4.207 4.208 #if HAVE_DLFCN_H 4.209 @@ -13370,11 +13372,11 @@ 4.210 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.211 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.212 -e 's:$: $lt_compiler_flag:'` 4.213 - (eval echo "\"\$as_me:13373: $lt_compile\"" >&5) 4.214 + (eval echo "\"\$as_me:13375: $lt_compile\"" >&5) 4.215 (eval "$lt_compile" 2>conftest.err) 4.216 ac_status=$? 4.217 cat conftest.err >&5 4.218 - echo "$as_me:13377: \$? = $ac_status" >&5 4.219 + echo "$as_me:13379: \$? = $ac_status" >&5 4.220 if (exit $ac_status) && test -s "$ac_outfile"; then 4.221 # The compiler can only warn and ignore the option if not recognized 4.222 # So say no if there are warnings 4.223 @@ -13437,11 +13439,11 @@ 4.224 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.225 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.226 -e 's:$: $lt_compiler_flag:'` 4.227 - (eval echo "\"\$as_me:13440: $lt_compile\"" >&5) 4.228 + (eval echo "\"\$as_me:13442: $lt_compile\"" >&5) 4.229 (eval "$lt_compile" 2>out/conftest.err) 4.230 ac_status=$? 4.231 cat out/conftest.err >&5 4.232 - echo "$as_me:13444: \$? = $ac_status" >&5 4.233 + echo "$as_me:13446: \$? = $ac_status" >&5 4.234 if (exit $ac_status) && test -s out/conftest2.$ac_objext 4.235 then 4.236 # The compiler can only warn and ignore the option if not recognized 4.237 @@ -15377,11 +15379,11 @@ 4.238 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.239 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.240 -e 's:$: $lt_compiler_flag:'` 4.241 - (eval echo "\"\$as_me:15380: $lt_compile\"" >&5) 4.242 + (eval echo "\"\$as_me:15382: $lt_compile\"" >&5) 4.243 (eval "$lt_compile" 2>conftest.err) 4.244 ac_status=$? 4.245 cat conftest.err >&5 4.246 - echo "$as_me:15384: \$? = $ac_status" >&5 4.247 + echo "$as_me:15386: \$? = $ac_status" >&5 4.248 if (exit $ac_status) && test -s "$ac_outfile"; then 4.249 # The compiler can only warn and ignore the option if not recognized 4.250 # So say no if there are warnings 4.251 @@ -15609,11 +15611,11 @@ 4.252 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.253 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.254 -e 's:$: $lt_compiler_flag:'` 4.255 - (eval echo "\"\$as_me:15612: $lt_compile\"" >&5) 4.256 + (eval echo "\"\$as_me:15614: $lt_compile\"" >&5) 4.257 (eval "$lt_compile" 2>conftest.err) 4.258 ac_status=$? 4.259 cat conftest.err >&5 4.260 - echo "$as_me:15616: \$? = $ac_status" >&5 4.261 + echo "$as_me:15618: \$? = $ac_status" >&5 4.262 if (exit $ac_status) && test -s "$ac_outfile"; then 4.263 # The compiler can only warn and ignore the option if not recognized 4.264 # So say no if there are warnings 4.265 @@ -15676,11 +15678,11 @@ 4.266 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ 4.267 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 4.268 -e 's:$: $lt_compiler_flag:'` 4.269 - (eval echo "\"\$as_me:15679: $lt_compile\"" >&5) 4.270 + (eval echo "\"\$as_me:15681: $lt_compile\"" >&5) 4.271 (eval "$lt_compile" 2>out/conftest.err) 4.272 ac_status=$? 4.273 cat out/conftest.err >&5 4.274 - echo "$as_me:15683: \$? = $ac_status" >&5 4.275 + echo "$as_me:15685: \$? = $ac_status" >&5 4.276 if (exit $ac_status) && test -s out/conftest2.$ac_objext 4.277 then 4.278 # The compiler can only warn and ignore the option if not recognized 4.279 @@ -17688,7 +17690,7 @@ 4.280 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.281 lt_status=$lt_dlunknown 4.282 cat > conftest.$ac_ext <<EOF 4.283 -#line 17691 "configure" 4.284 +#line 17693 "configure" 4.285 #include "confdefs.h" 4.286 4.287 #if HAVE_DLFCN_H 4.288 @@ -17786,7 +17788,7 @@ 4.289 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 4.290 lt_status=$lt_dlunknown 4.291 cat > conftest.$ac_ext <<EOF 4.292 -#line 17789 "configure" 4.293 +#line 17791 "configure" 4.294 #include "confdefs.h" 4.295 4.296 #if HAVE_DLFCN_H 4.297 @@ -19818,7 +19820,7 @@ 4.298 fi 4.299 4.300 if test x"$sim_ac_want_x11" = xno; then 4.301 - # Qt/X11 needs X11, which you need to enable by --enable-x11 4.302 + # Using Qt/X11 but option --enable-darwin-x11 not given 4.303 cat >conftest.$ac_ext <<_ACEOF 4.304 #line $LINENO "configure" 4.305 /* confdefs.h. */ 4.306 @@ -19860,10 +19862,76 @@ 4.307 4.308 : ${sim_ac_message_file=$ac_aux_dir/errors.txt} 4.309 if test -f $sim_ac_message_file; then 4.310 - sim_ac_message="`sed -n -e '/^!x11-qt-on-mac$/,/^!/ { /^!/ d; p; }' <$sim_ac_message_file`" 4.311 + sim_ac_message="`sed -n -e '/^!x11-qt-but-no-x11-requested$/,/^!/ { /^!/ d; p; }' <$sim_ac_message_file`" 4.312 if test x"$sim_ac_message" = x""; then 4.313 - { { echo "$as_me:$LINENO: error: no message named 'x11-qt-on-mac' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&5 4.314 -echo "$as_me: error: no message named 'x11-qt-on-mac' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&2;} 4.315 + { { echo "$as_me:$LINENO: error: no message named 'x11-qt-but-no-x11-requested' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&5 4.316 +echo "$as_me: error: no message named 'x11-qt-but-no-x11-requested' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&2;} 4.317 + { (exit 1); exit 1; }; } 4.318 + else 4.319 + eval "echo >&2 \"$sim_ac_message\"" 4.320 + fi 4.321 +else 4.322 + { { echo "$as_me:$LINENO: error: file '$sim_ac_message_file' not found - notify the $PACKAGE_NAME maintainer(s)" >&5 4.323 +echo "$as_me: error: file '$sim_ac_message_file' not found - notify the $PACKAGE_NAME maintainer(s)" >&2;} 4.324 + { (exit 1); exit 1; }; } 4.325 +fi 4.326 + 4.327 + 4.328 + 4.329 +echo >&2 "" 4.330 +{ { echo "$as_me:$LINENO: error: aborting" >&5 4.331 +echo "$as_me: error: aborting" >&2;} 4.332 + { (exit 1); exit 1; }; } 4.333 + 4.334 +fi 4.335 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.336 + else 4.337 + # --enable-darwin-x11 specified but attempting Qt/Mac linkage 4.338 + cat >conftest.$ac_ext <<_ACEOF 4.339 +#line $LINENO "configure" 4.340 +/* confdefs.h. */ 4.341 +_ACEOF 4.342 +cat confdefs.h >>conftest.$ac_ext 4.343 +cat >>conftest.$ac_ext <<_ACEOF 4.344 +/* end confdefs.h. */ 4.345 +#include <qapplication.h> 4.346 +int 4.347 +main () 4.348 +{ 4.349 +#if defined(__APPLE__) && defined(Q_WS_MAC) 4.350 + #error blah! 4.351 + #endif 4.352 + ; 4.353 + return 0; 4.354 +} 4.355 +_ACEOF 4.356 +rm -f conftest.$ac_objext conftest$ac_exeext 4.357 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.358 + (eval $ac_link) 2>&5 4.359 + ac_status=$? 4.360 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.361 + (exit $ac_status); } && 4.362 + { ac_try='test -s conftest$ac_exeext' 4.363 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.364 + (eval $ac_try) 2>&5 4.365 + ac_status=$? 4.366 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.367 + (exit $ac_status); }; }; then 4.368 + : 4.369 +else 4.370 + echo "$as_me: failed program was:" >&5 4.371 +sed 's/^/| /' conftest.$ac_ext >&5 4.372 + 4.373 + 4.374 +echo >&2 "" 4.375 + 4.376 + 4.377 +: ${sim_ac_message_file=$ac_aux_dir/errors.txt} 4.378 +if test -f $sim_ac_message_file; then 4.379 + sim_ac_message="`sed -n -e '/^!mac-qt-but-x11-requested$/,/^!/ { /^!/ d; p; }' <$sim_ac_message_file`" 4.380 + if test x"$sim_ac_message" = x""; then 4.381 + { { echo "$as_me:$LINENO: error: no message named 'mac-qt-but-x11-requested' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&5 4.382 +echo "$as_me: error: no message named 'mac-qt-but-x11-requested' in '$sim_ac_message_file' - notify the $PACKAGE_NAME maintainer(s)" >&2;} 4.383 { (exit 1); exit 1; }; } 4.384 else 4.385 eval "echo >&2 \"$sim_ac_message\"" 4.386 @@ -20593,6 +20661,1083 @@ 4.387 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 4.388 fi 4.389 4.390 +if test "$no_x" = yes; then 4.391 + # Not all programs may use this symbol, but it does not hurt to define it. 4.392 + 4.393 +cat >>confdefs.h <<\_ACEOF 4.394 +#define X_DISPLAY_MISSING 1 4.395 +_ACEOF 4.396 + 4.397 + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= 4.398 +else 4.399 + if test -n "$x_includes"; then 4.400 + X_CFLAGS="$X_CFLAGS -I$x_includes" 4.401 + fi 4.402 + 4.403 + # It would also be nice to do this for all -L options, not just this one. 4.404 + if test -n "$x_libraries"; then 4.405 + X_LIBS="$X_LIBS -L$x_libraries" 4.406 + # For Solaris; some versions of Sun CC require a space after -R and 4.407 + # others require no space. Words are not sufficient . . . . 4.408 + case `(uname -sr) 2>/dev/null` in 4.409 + "SunOS 5"*) 4.410 + echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 4.411 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 4.412 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" 4.413 + cat >conftest.$ac_ext <<_ACEOF 4.414 +#line $LINENO "configure" 4.415 +/* confdefs.h. */ 4.416 +_ACEOF 4.417 +cat confdefs.h >>conftest.$ac_ext 4.418 +cat >>conftest.$ac_ext <<_ACEOF 4.419 +/* end confdefs.h. */ 4.420 + 4.421 +int 4.422 +main () 4.423 +{ 4.424 + 4.425 + ; 4.426 + return 0; 4.427 +} 4.428 +_ACEOF 4.429 +rm -f conftest.$ac_objext conftest$ac_exeext 4.430 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.431 + (eval $ac_link) 2>&5 4.432 + ac_status=$? 4.433 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.434 + (exit $ac_status); } && 4.435 + { ac_try='test -s conftest$ac_exeext' 4.436 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.437 + (eval $ac_try) 2>&5 4.438 + ac_status=$? 4.439 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.440 + (exit $ac_status); }; }; then 4.441 + ac_R_nospace=yes 4.442 +else 4.443 + echo "$as_me: failed program was:" >&5 4.444 +sed 's/^/| /' conftest.$ac_ext >&5 4.445 + 4.446 +ac_R_nospace=no 4.447 +fi 4.448 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.449 + if test $ac_R_nospace = yes; then 4.450 + echo "$as_me:$LINENO: result: no" >&5 4.451 +echo "${ECHO_T}no" >&6 4.452 + X_LIBS="$X_LIBS -R$x_libraries" 4.453 + else 4.454 + LIBS="$ac_xsave_LIBS -R $x_libraries" 4.455 + cat >conftest.$ac_ext <<_ACEOF 4.456 +#line $LINENO "configure" 4.457 +/* confdefs.h. */ 4.458 +_ACEOF 4.459 +cat confdefs.h >>conftest.$ac_ext 4.460 +cat >>conftest.$ac_ext <<_ACEOF 4.461 +/* end confdefs.h. */ 4.462 + 4.463 +int 4.464 +main () 4.465 +{ 4.466 + 4.467 + ; 4.468 + return 0; 4.469 +} 4.470 +_ACEOF 4.471 +rm -f conftest.$ac_objext conftest$ac_exeext 4.472 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.473 + (eval $ac_link) 2>&5 4.474 + ac_status=$? 4.475 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.476 + (exit $ac_status); } && 4.477 + { ac_try='test -s conftest$ac_exeext' 4.478 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.479 + (eval $ac_try) 2>&5 4.480 + ac_status=$? 4.481 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.482 + (exit $ac_status); }; }; then 4.483 + ac_R_space=yes 4.484 +else 4.485 + echo "$as_me: failed program was:" >&5 4.486 +sed 's/^/| /' conftest.$ac_ext >&5 4.487 + 4.488 +ac_R_space=no 4.489 +fi 4.490 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.491 + if test $ac_R_space = yes; then 4.492 + echo "$as_me:$LINENO: result: yes" >&5 4.493 +echo "${ECHO_T}yes" >&6 4.494 + X_LIBS="$X_LIBS -R $x_libraries" 4.495 + else 4.496 + echo "$as_me:$LINENO: result: neither works" >&5 4.497 +echo "${ECHO_T}neither works" >&6 4.498 + fi 4.499 + fi 4.500 + LIBS=$ac_xsave_LIBS 4.501 + esac 4.502 + fi 4.503 + 4.504 + # Check for system-dependent libraries X programs must link with. 4.505 + # Do this before checking for the system-independent R6 libraries 4.506 + # (-lICE), since we may need -lsocket or whatever for X linking. 4.507 + 4.508 + if test "$ISC" = yes; then 4.509 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" 4.510 + else 4.511 + # Martyn Johnson says this is needed for Ultrix, if the X 4.512 + # libraries were built with DECnet support. And Karl Berry says 4.513 + # the Alpha needs dnet_stub (dnet does not exist). 4.514 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" 4.515 + cat >conftest.$ac_ext <<_ACEOF 4.516 +#line $LINENO "configure" 4.517 +/* confdefs.h. */ 4.518 +_ACEOF 4.519 +cat confdefs.h >>conftest.$ac_ext 4.520 +cat >>conftest.$ac_ext <<_ACEOF 4.521 +/* end confdefs.h. */ 4.522 + 4.523 +/* Override any gcc2 internal prototype to avoid an error. */ 4.524 +#ifdef __cplusplus 4.525 +extern "C" 4.526 +#endif 4.527 +/* We use char because int might match the return type of a gcc2 4.528 + builtin and then its argument prototype would still apply. */ 4.529 +char XOpenDisplay (); 4.530 +int 4.531 +main () 4.532 +{ 4.533 +XOpenDisplay (); 4.534 + ; 4.535 + return 0; 4.536 +} 4.537 +_ACEOF 4.538 +rm -f conftest.$ac_objext conftest$ac_exeext 4.539 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.540 + (eval $ac_link) 2>&5 4.541 + ac_status=$? 4.542 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.543 + (exit $ac_status); } && 4.544 + { ac_try='test -s conftest$ac_exeext' 4.545 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.546 + (eval $ac_try) 2>&5 4.547 + ac_status=$? 4.548 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.549 + (exit $ac_status); }; }; then 4.550 + : 4.551 +else 4.552 + echo "$as_me: failed program was:" >&5 4.553 +sed 's/^/| /' conftest.$ac_ext >&5 4.554 + 4.555 +echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 4.556 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 4.557 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then 4.558 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.559 +else 4.560 + ac_check_lib_save_LIBS=$LIBS 4.561 +LIBS="-ldnet $LIBS" 4.562 +cat >conftest.$ac_ext <<_ACEOF 4.563 +#line $LINENO "configure" 4.564 +/* confdefs.h. */ 4.565 +_ACEOF 4.566 +cat confdefs.h >>conftest.$ac_ext 4.567 +cat >>conftest.$ac_ext <<_ACEOF 4.568 +/* end confdefs.h. */ 4.569 + 4.570 +/* Override any gcc2 internal prototype to avoid an error. */ 4.571 +#ifdef __cplusplus 4.572 +extern "C" 4.573 +#endif 4.574 +/* We use char because int might match the return type of a gcc2 4.575 + builtin and then its argument prototype would still apply. */ 4.576 +char dnet_ntoa (); 4.577 +int 4.578 +main () 4.579 +{ 4.580 +dnet_ntoa (); 4.581 + ; 4.582 + return 0; 4.583 +} 4.584 +_ACEOF 4.585 +rm -f conftest.$ac_objext conftest$ac_exeext 4.586 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.587 + (eval $ac_link) 2>&5 4.588 + ac_status=$? 4.589 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.590 + (exit $ac_status); } && 4.591 + { ac_try='test -s conftest$ac_exeext' 4.592 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.593 + (eval $ac_try) 2>&5 4.594 + ac_status=$? 4.595 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.596 + (exit $ac_status); }; }; then 4.597 + ac_cv_lib_dnet_dnet_ntoa=yes 4.598 +else 4.599 + echo "$as_me: failed program was:" >&5 4.600 +sed 's/^/| /' conftest.$ac_ext >&5 4.601 + 4.602 +ac_cv_lib_dnet_dnet_ntoa=no 4.603 +fi 4.604 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.605 +LIBS=$ac_check_lib_save_LIBS 4.606 +fi 4.607 +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 4.608 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 4.609 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then 4.610 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 4.611 +fi 4.612 + 4.613 + if test $ac_cv_lib_dnet_dnet_ntoa = no; then 4.614 + echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 4.615 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 4.616 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then 4.617 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.618 +else 4.619 + ac_check_lib_save_LIBS=$LIBS 4.620 +LIBS="-ldnet_stub $LIBS" 4.621 +cat >conftest.$ac_ext <<_ACEOF 4.622 +#line $LINENO "configure" 4.623 +/* confdefs.h. */ 4.624 +_ACEOF 4.625 +cat confdefs.h >>conftest.$ac_ext 4.626 +cat >>conftest.$ac_ext <<_ACEOF 4.627 +/* end confdefs.h. */ 4.628 + 4.629 +/* Override any gcc2 internal prototype to avoid an error. */ 4.630 +#ifdef __cplusplus 4.631 +extern "C" 4.632 +#endif 4.633 +/* We use char because int might match the return type of a gcc2 4.634 + builtin and then its argument prototype would still apply. */ 4.635 +char dnet_ntoa (); 4.636 +int 4.637 +main () 4.638 +{ 4.639 +dnet_ntoa (); 4.640 + ; 4.641 + return 0; 4.642 +} 4.643 +_ACEOF 4.644 +rm -f conftest.$ac_objext conftest$ac_exeext 4.645 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.646 + (eval $ac_link) 2>&5 4.647 + ac_status=$? 4.648 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.649 + (exit $ac_status); } && 4.650 + { ac_try='test -s conftest$ac_exeext' 4.651 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.652 + (eval $ac_try) 2>&5 4.653 + ac_status=$? 4.654 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.655 + (exit $ac_status); }; }; then 4.656 + ac_cv_lib_dnet_stub_dnet_ntoa=yes 4.657 +else 4.658 + echo "$as_me: failed program was:" >&5 4.659 +sed 's/^/| /' conftest.$ac_ext >&5 4.660 + 4.661 +ac_cv_lib_dnet_stub_dnet_ntoa=no 4.662 +fi 4.663 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.664 +LIBS=$ac_check_lib_save_LIBS 4.665 +fi 4.666 +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 4.667 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 4.668 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then 4.669 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 4.670 +fi 4.671 + 4.672 + fi 4.673 +fi 4.674 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.675 + LIBS="$ac_xsave_LIBS" 4.676 + 4.677 + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, 4.678 + # to get the SysV transport functions. 4.679 + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) 4.680 + # needs -lnsl. 4.681 + # The nsl library prevents programs from opening the X display 4.682 + # on Irix 5.2, according to T.E. Dickey. 4.683 + # The functions gethostbyname, getservbyname, and inet_addr are 4.684 + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 4.685 + echo "$as_me:$LINENO: checking for gethostbyname" >&5 4.686 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 4.687 +if test "${ac_cv_func_gethostbyname+set}" = set; then 4.688 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.689 +else 4.690 + cat >conftest.$ac_ext <<_ACEOF 4.691 +#line $LINENO "configure" 4.692 +/* confdefs.h. */ 4.693 +_ACEOF 4.694 +cat confdefs.h >>conftest.$ac_ext 4.695 +cat >>conftest.$ac_ext <<_ACEOF 4.696 +/* end confdefs.h. */ 4.697 +/* System header to define __stub macros and hopefully few prototypes, 4.698 + which can conflict with char gethostbyname (); below. 4.699 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4.700 + <limits.h> exists even on freestanding compilers. */ 4.701 +#ifdef __STDC__ 4.702 +# include <limits.h> 4.703 +#else 4.704 +# include <assert.h> 4.705 +#endif 4.706 +/* Override any gcc2 internal prototype to avoid an error. */ 4.707 +#ifdef __cplusplus 4.708 +extern "C" 4.709 +{ 4.710 +#endif 4.711 +/* We use char because int might match the return type of a gcc2 4.712 + builtin and then its argument prototype would still apply. */ 4.713 +char gethostbyname (); 4.714 +/* The GNU C library defines this for functions which it implements 4.715 + to always fail with ENOSYS. Some functions are actually named 4.716 + something starting with __ and the normal name is an alias. */ 4.717 +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) 4.718 +choke me 4.719 +#else 4.720 +char (*f) () = gethostbyname; 4.721 +#endif 4.722 +#ifdef __cplusplus 4.723 +} 4.724 +#endif 4.725 + 4.726 +int 4.727 +main () 4.728 +{ 4.729 +return f != gethostbyname; 4.730 + ; 4.731 + return 0; 4.732 +} 4.733 +_ACEOF 4.734 +rm -f conftest.$ac_objext conftest$ac_exeext 4.735 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.736 + (eval $ac_link) 2>&5 4.737 + ac_status=$? 4.738 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.739 + (exit $ac_status); } && 4.740 + { ac_try='test -s conftest$ac_exeext' 4.741 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.742 + (eval $ac_try) 2>&5 4.743 + ac_status=$? 4.744 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.745 + (exit $ac_status); }; }; then 4.746 + ac_cv_func_gethostbyname=yes 4.747 +else 4.748 + echo "$as_me: failed program was:" >&5 4.749 +sed 's/^/| /' conftest.$ac_ext >&5 4.750 + 4.751 +ac_cv_func_gethostbyname=no 4.752 +fi 4.753 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.754 +fi 4.755 +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 4.756 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 4.757 + 4.758 + if test $ac_cv_func_gethostbyname = no; then 4.759 + echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 4.760 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 4.761 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then 4.762 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.763 +else 4.764 + ac_check_lib_save_LIBS=$LIBS 4.765 +LIBS="-lnsl $LIBS" 4.766 +cat >conftest.$ac_ext <<_ACEOF 4.767 +#line $LINENO "configure" 4.768 +/* confdefs.h. */ 4.769 +_ACEOF 4.770 +cat confdefs.h >>conftest.$ac_ext 4.771 +cat >>conftest.$ac_ext <<_ACEOF 4.772 +/* end confdefs.h. */ 4.773 + 4.774 +/* Override any gcc2 internal prototype to avoid an error. */ 4.775 +#ifdef __cplusplus 4.776 +extern "C" 4.777 +#endif 4.778 +/* We use char because int might match the return type of a gcc2 4.779 + builtin and then its argument prototype would still apply. */ 4.780 +char gethostbyname (); 4.781 +int 4.782 +main () 4.783 +{ 4.784 +gethostbyname (); 4.785 + ; 4.786 + return 0; 4.787 +} 4.788 +_ACEOF 4.789 +rm -f conftest.$ac_objext conftest$ac_exeext 4.790 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.791 + (eval $ac_link) 2>&5 4.792 + ac_status=$? 4.793 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.794 + (exit $ac_status); } && 4.795 + { ac_try='test -s conftest$ac_exeext' 4.796 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.797 + (eval $ac_try) 2>&5 4.798 + ac_status=$? 4.799 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.800 + (exit $ac_status); }; }; then 4.801 + ac_cv_lib_nsl_gethostbyname=yes 4.802 +else 4.803 + echo "$as_me: failed program was:" >&5 4.804 +sed 's/^/| /' conftest.$ac_ext >&5 4.805 + 4.806 +ac_cv_lib_nsl_gethostbyname=no 4.807 +fi 4.808 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.809 +LIBS=$ac_check_lib_save_LIBS 4.810 +fi 4.811 +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 4.812 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 4.813 +if test $ac_cv_lib_nsl_gethostbyname = yes; then 4.814 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 4.815 +fi 4.816 + 4.817 + if test $ac_cv_lib_nsl_gethostbyname = no; then 4.818 + echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 4.819 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 4.820 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then 4.821 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.822 +else 4.823 + ac_check_lib_save_LIBS=$LIBS 4.824 +LIBS="-lbsd $LIBS" 4.825 +cat >conftest.$ac_ext <<_ACEOF 4.826 +#line $LINENO "configure" 4.827 +/* confdefs.h. */ 4.828 +_ACEOF 4.829 +cat confdefs.h >>conftest.$ac_ext 4.830 +cat >>conftest.$ac_ext <<_ACEOF 4.831 +/* end confdefs.h. */ 4.832 + 4.833 +/* Override any gcc2 internal prototype to avoid an error. */ 4.834 +#ifdef __cplusplus 4.835 +extern "C" 4.836 +#endif 4.837 +/* We use char because int might match the return type of a gcc2 4.838 + builtin and then its argument prototype would still apply. */ 4.839 +char gethostbyname (); 4.840 +int 4.841 +main () 4.842 +{ 4.843 +gethostbyname (); 4.844 + ; 4.845 + return 0; 4.846 +} 4.847 +_ACEOF 4.848 +rm -f conftest.$ac_objext conftest$ac_exeext 4.849 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.850 + (eval $ac_link) 2>&5 4.851 + ac_status=$? 4.852 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.853 + (exit $ac_status); } && 4.854 + { ac_try='test -s conftest$ac_exeext' 4.855 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.856 + (eval $ac_try) 2>&5 4.857 + ac_status=$? 4.858 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.859 + (exit $ac_status); }; }; then 4.860 + ac_cv_lib_bsd_gethostbyname=yes 4.861 +else 4.862 + echo "$as_me: failed program was:" >&5 4.863 +sed 's/^/| /' conftest.$ac_ext >&5 4.864 + 4.865 +ac_cv_lib_bsd_gethostbyname=no 4.866 +fi 4.867 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.868 +LIBS=$ac_check_lib_save_LIBS 4.869 +fi 4.870 +echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 4.871 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 4.872 +if test $ac_cv_lib_bsd_gethostbyname = yes; then 4.873 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 4.874 +fi 4.875 + 4.876 + fi 4.877 + fi 4.878 + 4.879 + # lieder@skyler.mavd.honeywell.com says without -lsocket, 4.880 + # socket/setsockopt and other routines are undefined under SCO ODT 4.881 + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary 4.882 + # on later versions), says Simon Leinen: it contains gethostby* 4.883 + # variants that don't use the name server (or something). -lsocket 4.884 + # must be given before -lnsl if both are needed. We assume that 4.885 + # if connect needs -lnsl, so does gethostbyname. 4.886 + echo "$as_me:$LINENO: checking for connect" >&5 4.887 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 4.888 +if test "${ac_cv_func_connect+set}" = set; then 4.889 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.890 +else 4.891 + cat >conftest.$ac_ext <<_ACEOF 4.892 +#line $LINENO "configure" 4.893 +/* confdefs.h. */ 4.894 +_ACEOF 4.895 +cat confdefs.h >>conftest.$ac_ext 4.896 +cat >>conftest.$ac_ext <<_ACEOF 4.897 +/* end confdefs.h. */ 4.898 +/* System header to define __stub macros and hopefully few prototypes, 4.899 + which can conflict with char connect (); below. 4.900 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4.901 + <limits.h> exists even on freestanding compilers. */ 4.902 +#ifdef __STDC__ 4.903 +# include <limits.h> 4.904 +#else 4.905 +# include <assert.h> 4.906 +#endif 4.907 +/* Override any gcc2 internal prototype to avoid an error. */ 4.908 +#ifdef __cplusplus 4.909 +extern "C" 4.910 +{ 4.911 +#endif 4.912 +/* We use char because int might match the return type of a gcc2 4.913 + builtin and then its argument prototype would still apply. */ 4.914 +char connect (); 4.915 +/* The GNU C library defines this for functions which it implements 4.916 + to always fail with ENOSYS. Some functions are actually named 4.917 + something starting with __ and the normal name is an alias. */ 4.918 +#if defined (__stub_connect) || defined (__stub___connect) 4.919 +choke me 4.920 +#else 4.921 +char (*f) () = connect; 4.922 +#endif 4.923 +#ifdef __cplusplus 4.924 +} 4.925 +#endif 4.926 + 4.927 +int 4.928 +main () 4.929 +{ 4.930 +return f != connect; 4.931 + ; 4.932 + return 0; 4.933 +} 4.934 +_ACEOF 4.935 +rm -f conftest.$ac_objext conftest$ac_exeext 4.936 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.937 + (eval $ac_link) 2>&5 4.938 + ac_status=$? 4.939 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.940 + (exit $ac_status); } && 4.941 + { ac_try='test -s conftest$ac_exeext' 4.942 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.943 + (eval $ac_try) 2>&5 4.944 + ac_status=$? 4.945 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.946 + (exit $ac_status); }; }; then 4.947 + ac_cv_func_connect=yes 4.948 +else 4.949 + echo "$as_me: failed program was:" >&5 4.950 +sed 's/^/| /' conftest.$ac_ext >&5 4.951 + 4.952 +ac_cv_func_connect=no 4.953 +fi 4.954 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.955 +fi 4.956 +echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 4.957 +echo "${ECHO_T}$ac_cv_func_connect" >&6 4.958 + 4.959 + if test $ac_cv_func_connect = no; then 4.960 + echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 4.961 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 4.962 +if test "${ac_cv_lib_socket_connect+set}" = set; then 4.963 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.964 +else 4.965 + ac_check_lib_save_LIBS=$LIBS 4.966 +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 4.967 +cat >conftest.$ac_ext <<_ACEOF 4.968 +#line $LINENO "configure" 4.969 +/* confdefs.h. */ 4.970 +_ACEOF 4.971 +cat confdefs.h >>conftest.$ac_ext 4.972 +cat >>conftest.$ac_ext <<_ACEOF 4.973 +/* end confdefs.h. */ 4.974 + 4.975 +/* Override any gcc2 internal prototype to avoid an error. */ 4.976 +#ifdef __cplusplus 4.977 +extern "C" 4.978 +#endif 4.979 +/* We use char because int might match the return type of a gcc2 4.980 + builtin and then its argument prototype would still apply. */ 4.981 +char connect (); 4.982 +int 4.983 +main () 4.984 +{ 4.985 +connect (); 4.986 + ; 4.987 + return 0; 4.988 +} 4.989 +_ACEOF 4.990 +rm -f conftest.$ac_objext conftest$ac_exeext 4.991 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.992 + (eval $ac_link) 2>&5 4.993 + ac_status=$? 4.994 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.995 + (exit $ac_status); } && 4.996 + { ac_try='test -s conftest$ac_exeext' 4.997 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.998 + (eval $ac_try) 2>&5 4.999 + ac_status=$? 4.1000 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1001 + (exit $ac_status); }; }; then 4.1002 + ac_cv_lib_socket_connect=yes 4.1003 +else 4.1004 + echo "$as_me: failed program was:" >&5 4.1005 +sed 's/^/| /' conftest.$ac_ext >&5 4.1006 + 4.1007 +ac_cv_lib_socket_connect=no 4.1008 +fi 4.1009 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1010 +LIBS=$ac_check_lib_save_LIBS 4.1011 +fi 4.1012 +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 4.1013 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 4.1014 +if test $ac_cv_lib_socket_connect = yes; then 4.1015 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 4.1016 +fi 4.1017 + 4.1018 + fi 4.1019 + 4.1020 + # Guillermo Gomez says -lposix is necessary on A/UX. 4.1021 + echo "$as_me:$LINENO: checking for remove" >&5 4.1022 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 4.1023 +if test "${ac_cv_func_remove+set}" = set; then 4.1024 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1025 +else 4.1026 + cat >conftest.$ac_ext <<_ACEOF 4.1027 +#line $LINENO "configure" 4.1028 +/* confdefs.h. */ 4.1029 +_ACEOF 4.1030 +cat confdefs.h >>conftest.$ac_ext 4.1031 +cat >>conftest.$ac_ext <<_ACEOF 4.1032 +/* end confdefs.h. */ 4.1033 +/* System header to define __stub macros and hopefully few prototypes, 4.1034 + which can conflict with char remove (); below. 4.1035 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4.1036 + <limits.h> exists even on freestanding compilers. */ 4.1037 +#ifdef __STDC__ 4.1038 +# include <limits.h> 4.1039 +#else 4.1040 +# include <assert.h> 4.1041 +#endif 4.1042 +/* Override any gcc2 internal prototype to avoid an error. */ 4.1043 +#ifdef __cplusplus 4.1044 +extern "C" 4.1045 +{ 4.1046 +#endif 4.1047 +/* We use char because int might match the return type of a gcc2 4.1048 + builtin and then its argument prototype would still apply. */ 4.1049 +char remove (); 4.1050 +/* The GNU C library defines this for functions which it implements 4.1051 + to always fail with ENOSYS. Some functions are actually named 4.1052 + something starting with __ and the normal name is an alias. */ 4.1053 +#if defined (__stub_remove) || defined (__stub___remove) 4.1054 +choke me 4.1055 +#else 4.1056 +char (*f) () = remove; 4.1057 +#endif 4.1058 +#ifdef __cplusplus 4.1059 +} 4.1060 +#endif 4.1061 + 4.1062 +int 4.1063 +main () 4.1064 +{ 4.1065 +return f != remove; 4.1066 + ; 4.1067 + return 0; 4.1068 +} 4.1069 +_ACEOF 4.1070 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1071 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1072 + (eval $ac_link) 2>&5 4.1073 + ac_status=$? 4.1074 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1075 + (exit $ac_status); } && 4.1076 + { ac_try='test -s conftest$ac_exeext' 4.1077 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1078 + (eval $ac_try) 2>&5 4.1079 + ac_status=$? 4.1080 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1081 + (exit $ac_status); }; }; then 4.1082 + ac_cv_func_remove=yes 4.1083 +else 4.1084 + echo "$as_me: failed program was:" >&5 4.1085 +sed 's/^/| /' conftest.$ac_ext >&5 4.1086 + 4.1087 +ac_cv_func_remove=no 4.1088 +fi 4.1089 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1090 +fi 4.1091 +echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 4.1092 +echo "${ECHO_T}$ac_cv_func_remove" >&6 4.1093 + 4.1094 + if test $ac_cv_func_remove = no; then 4.1095 + echo "$as_me:$LINENO: checking for remove in -lposix" >&5 4.1096 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 4.1097 +if test "${ac_cv_lib_posix_remove+set}" = set; then 4.1098 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1099 +else 4.1100 + ac_check_lib_save_LIBS=$LIBS 4.1101 +LIBS="-lposix $LIBS" 4.1102 +cat >conftest.$ac_ext <<_ACEOF 4.1103 +#line $LINENO "configure" 4.1104 +/* confdefs.h. */ 4.1105 +_ACEOF 4.1106 +cat confdefs.h >>conftest.$ac_ext 4.1107 +cat >>conftest.$ac_ext <<_ACEOF 4.1108 +/* end confdefs.h. */ 4.1109 + 4.1110 +/* Override any gcc2 internal prototype to avoid an error. */ 4.1111 +#ifdef __cplusplus 4.1112 +extern "C" 4.1113 +#endif 4.1114 +/* We use char because int might match the return type of a gcc2 4.1115 + builtin and then its argument prototype would still apply. */ 4.1116 +char remove (); 4.1117 +int 4.1118 +main () 4.1119 +{ 4.1120 +remove (); 4.1121 + ; 4.1122 + return 0; 4.1123 +} 4.1124 +_ACEOF 4.1125 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1126 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1127 + (eval $ac_link) 2>&5 4.1128 + ac_status=$? 4.1129 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1130 + (exit $ac_status); } && 4.1131 + { ac_try='test -s conftest$ac_exeext' 4.1132 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1133 + (eval $ac_try) 2>&5 4.1134 + ac_status=$? 4.1135 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1136 + (exit $ac_status); }; }; then 4.1137 + ac_cv_lib_posix_remove=yes 4.1138 +else 4.1139 + echo "$as_me: failed program was:" >&5 4.1140 +sed 's/^/| /' conftest.$ac_ext >&5 4.1141 + 4.1142 +ac_cv_lib_posix_remove=no 4.1143 +fi 4.1144 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1145 +LIBS=$ac_check_lib_save_LIBS 4.1146 +fi 4.1147 +echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 4.1148 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 4.1149 +if test $ac_cv_lib_posix_remove = yes; then 4.1150 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 4.1151 +fi 4.1152 + 4.1153 + fi 4.1154 + 4.1155 + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 4.1156 + echo "$as_me:$LINENO: checking for shmat" >&5 4.1157 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 4.1158 +if test "${ac_cv_func_shmat+set}" = set; then 4.1159 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1160 +else 4.1161 + cat >conftest.$ac_ext <<_ACEOF 4.1162 +#line $LINENO "configure" 4.1163 +/* confdefs.h. */ 4.1164 +_ACEOF 4.1165 +cat confdefs.h >>conftest.$ac_ext 4.1166 +cat >>conftest.$ac_ext <<_ACEOF 4.1167 +/* end confdefs.h. */ 4.1168 +/* System header to define __stub macros and hopefully few prototypes, 4.1169 + which can conflict with char shmat (); below. 4.1170 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4.1171 + <limits.h> exists even on freestanding compilers. */ 4.1172 +#ifdef __STDC__ 4.1173 +# include <limits.h> 4.1174 +#else 4.1175 +# include <assert.h> 4.1176 +#endif 4.1177 +/* Override any gcc2 internal prototype to avoid an error. */ 4.1178 +#ifdef __cplusplus 4.1179 +extern "C" 4.1180 +{ 4.1181 +#endif 4.1182 +/* We use char because int might match the return type of a gcc2 4.1183 + builtin and then its argument prototype would still apply. */ 4.1184 +char shmat (); 4.1185 +/* The GNU C library defines this for functions which it implements 4.1186 + to always fail with ENOSYS. Some functions are actually named 4.1187 + something starting with __ and the normal name is an alias. */ 4.1188 +#if defined (__stub_shmat) || defined (__stub___shmat) 4.1189 +choke me 4.1190 +#else 4.1191 +char (*f) () = shmat; 4.1192 +#endif 4.1193 +#ifdef __cplusplus 4.1194 +} 4.1195 +#endif 4.1196 + 4.1197 +int 4.1198 +main () 4.1199 +{ 4.1200 +return f != shmat; 4.1201 + ; 4.1202 + return 0; 4.1203 +} 4.1204 +_ACEOF 4.1205 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1206 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1207 + (eval $ac_link) 2>&5 4.1208 + ac_status=$? 4.1209 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1210 + (exit $ac_status); } && 4.1211 + { ac_try='test -s conftest$ac_exeext' 4.1212 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1213 + (eval $ac_try) 2>&5 4.1214 + ac_status=$? 4.1215 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1216 + (exit $ac_status); }; }; then 4.1217 + ac_cv_func_shmat=yes 4.1218 +else 4.1219 + echo "$as_me: failed program was:" >&5 4.1220 +sed 's/^/| /' conftest.$ac_ext >&5 4.1221 + 4.1222 +ac_cv_func_shmat=no 4.1223 +fi 4.1224 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1225 +fi 4.1226 +echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 4.1227 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 4.1228 + 4.1229 + if test $ac_cv_func_shmat = no; then 4.1230 + echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 4.1231 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 4.1232 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then 4.1233 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1234 +else 4.1235 + ac_check_lib_save_LIBS=$LIBS 4.1236 +LIBS="-lipc $LIBS" 4.1237 +cat >conftest.$ac_ext <<_ACEOF 4.1238 +#line $LINENO "configure" 4.1239 +/* confdefs.h. */ 4.1240 +_ACEOF 4.1241 +cat confdefs.h >>conftest.$ac_ext 4.1242 +cat >>conftest.$ac_ext <<_ACEOF 4.1243 +/* end confdefs.h. */ 4.1244 + 4.1245 +/* Override any gcc2 internal prototype to avoid an error. */ 4.1246 +#ifdef __cplusplus 4.1247 +extern "C" 4.1248 +#endif 4.1249 +/* We use char because int might match the return type of a gcc2 4.1250 + builtin and then its argument prototype would still apply. */ 4.1251 +char shmat (); 4.1252 +int 4.1253 +main () 4.1254 +{ 4.1255 +shmat (); 4.1256 + ; 4.1257 + return 0; 4.1258 +} 4.1259 +_ACEOF 4.1260 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1261 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1262 + (eval $ac_link) 2>&5 4.1263 + ac_status=$? 4.1264 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1265 + (exit $ac_status); } && 4.1266 + { ac_try='test -s conftest$ac_exeext' 4.1267 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1268 + (eval $ac_try) 2>&5 4.1269 + ac_status=$? 4.1270 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1271 + (exit $ac_status); }; }; then 4.1272 + ac_cv_lib_ipc_shmat=yes 4.1273 +else 4.1274 + echo "$as_me: failed program was:" >&5 4.1275 +sed 's/^/| /' conftest.$ac_ext >&5 4.1276 + 4.1277 +ac_cv_lib_ipc_shmat=no 4.1278 +fi 4.1279 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1280 +LIBS=$ac_check_lib_save_LIBS 4.1281 +fi 4.1282 +echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 4.1283 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 4.1284 +if test $ac_cv_lib_ipc_shmat = yes; then 4.1285 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 4.1286 +fi 4.1287 + 4.1288 + fi 4.1289 + fi 4.1290 + 4.1291 + # Check for libraries that X11R6 Xt/Xaw programs need. 4.1292 + ac_save_LDFLAGS=$LDFLAGS 4.1293 + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" 4.1294 + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to 4.1295 + # check for ICE first), but we must link in the order -lSM -lICE or 4.1296 + # we get undefined symbols. So assume we have SM if we have ICE. 4.1297 + # These have to be linked with before -lX11, unlike the other 4.1298 + # libraries we check for below, so use a different variable. 4.1299 + # John Interrante, Karl Berry 4.1300 + echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 4.1301 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 4.1302 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then 4.1303 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1304 +else 4.1305 + ac_check_lib_save_LIBS=$LIBS 4.1306 +LIBS="-lICE $X_EXTRA_LIBS $LIBS" 4.1307 +cat >conftest.$ac_ext <<_ACEOF 4.1308 +#line $LINENO "configure" 4.1309 +/* confdefs.h. */ 4.1310 +_ACEOF 4.1311 +cat confdefs.h >>conftest.$ac_ext 4.1312 +cat >>conftest.$ac_ext <<_ACEOF 4.1313 +/* end confdefs.h. */ 4.1314 + 4.1315 +/* Override any gcc2 internal prototype to avoid an error. */ 4.1316 +#ifdef __cplusplus 4.1317 +extern "C" 4.1318 +#endif 4.1319 +/* We use char because int might match the return type of a gcc2 4.1320 + builtin and then its argument prototype would still apply. */ 4.1321 +char IceConnectionNumber (); 4.1322 +int 4.1323 +main () 4.1324 +{ 4.1325 +IceConnectionNumber (); 4.1326 + ; 4.1327 + return 0; 4.1328 +} 4.1329 +_ACEOF 4.1330 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1331 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1332 + (eval $ac_link) 2>&5 4.1333 + ac_status=$? 4.1334 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1335 + (exit $ac_status); } && 4.1336 + { ac_try='test -s conftest$ac_exeext' 4.1337 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1338 + (eval $ac_try) 2>&5 4.1339 + ac_status=$? 4.1340 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1341 + (exit $ac_status); }; }; then 4.1342 + ac_cv_lib_ICE_IceConnectionNumber=yes 4.1343 +else 4.1344 + echo "$as_me: failed program was:" >&5 4.1345 +sed 's/^/| /' conftest.$ac_ext >&5 4.1346 + 4.1347 +ac_cv_lib_ICE_IceConnectionNumber=no 4.1348 +fi 4.1349 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1350 +LIBS=$ac_check_lib_save_LIBS 4.1351 +fi 4.1352 +echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 4.1353 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 4.1354 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then 4.1355 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 4.1356 +fi 4.1357 + 4.1358 + LDFLAGS=$ac_save_LDFLAGS 4.1359 + 4.1360 +fi 4.1361 + 4.1362 + 4.1363 + 4.1364 + 4.1365 +sim_ac_enable_darwin_x11=true 4.1366 + 4.1367 +case $host_os in 4.1368 + darwin* ) 4.1369 + # Check whether --enable-darwin-x11 or --disable-darwin-x11 was given. 4.1370 +if test "${enable_darwin_x11+set}" = set; then 4.1371 + enableval="$enable_darwin_x11" 4.1372 + case "${enableval}" in 4.1373 + yes | true) sim_ac_enable_darwin_x11=true ;; 4.1374 + no | false) sim_ac_enable_darwin_x11=false ;; 4.1375 + *) 4.1376 +{ { echo "$as_me:$LINENO: error: invalid value \"${enableval}\" for \"--enable-darwin-x11\" configure argument" >&5 4.1377 +echo "$as_me: error: invalid value \"${enableval}\" for \"--enable-darwin-x11\" configure argument" >&2;} 4.1378 + { (exit 1); exit 1; }; } 4.1379 + ;; 4.1380 + esac 4.1381 +else 4.1382 + sim_ac_enable_darwin_x11=false 4.1383 +fi; 4.1384 + ;; 4.1385 +esac 4.1386 + 4.1387 +sim_ac_x11_avail=no 4.1388 + 4.1389 +if test x"$no_x" != xyes -a x"$sim_ac_enable_darwin_x11" = xtrue; then 4.1390 + # *** DEBUG *** 4.1391 + # Keep this around, as it can be handy when testing on new systems. 4.1392 + # echo "X_CFLAGS: $X_CFLAGS" 4.1393 + # echo "X_PRE_LIBS: $X_PRE_LIBS" 4.1394 + # echo "X_LIBS: $X_LIBS" 4.1395 + # echo "X_EXTRA_LIBS: $X_EXTRA_LIBS" 4.1396 + # echo 4.1397 + # exit 0 4.1398 + 4.1399 + sim_ac_x11_cppflags="$X_CFLAGS" 4.1400 + sim_ac_x11_ldflags="$X_LIBS" 4.1401 + sim_ac_x11_libs="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" 4.1402 + 4.1403 + sim_ac_save_cppflags=$CPPFLAGS 4.1404 + sim_ac_save_ldflags=$LDFLAGS 4.1405 + sim_ac_save_libs=$LIBS 4.1406 + 4.1407 + CPPFLAGS="$CPPFLAGS $sim_ac_x11_cppflags" 4.1408 + LDFLAGS="$LDFLAGS $sim_ac_x11_ldflags" 4.1409 + LIBS="$sim_ac_x11_libs $LIBS" 4.1410 + 4.1411 + echo "$as_me:$LINENO: checking whether we can link against X11" >&5 4.1412 +echo $ECHO_N "checking whether we can link against X11... $ECHO_C" >&6 4.1413 +if test "${sim_cv_lib_x11_avail+set}" = set; then 4.1414 + echo $ECHO_N "(cached) $ECHO_C" >&6 4.1415 +else 4.1416 + cat >conftest.$ac_ext <<_ACEOF 4.1417 +#line $LINENO "configure" 4.1418 +/* confdefs.h. */ 4.1419 +_ACEOF 4.1420 +cat confdefs.h >>conftest.$ac_ext 4.1421 +cat >>conftest.$ac_ext <<_ACEOF 4.1422 +/* end confdefs.h. */ 4.1423 +#include <X11/Xlib.h> 4.1424 +int 4.1425 +main () 4.1426 +{ 4.1427 +(void)XOpenDisplay(0L); 4.1428 + ; 4.1429 + return 0; 4.1430 +} 4.1431 +_ACEOF 4.1432 +rm -f conftest.$ac_objext conftest$ac_exeext 4.1433 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4.1434 + (eval $ac_link) 2>&5 4.1435 + ac_status=$? 4.1436 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1437 + (exit $ac_status); } && 4.1438 + { ac_try='test -s conftest$ac_exeext' 4.1439 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4.1440 + (eval $ac_try) 2>&5 4.1441 + ac_status=$? 4.1442 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 4.1443 + (exit $ac_status); }; }; then 4.1444 + sim_cv_lib_x11_avail=yes 4.1445 +else 4.1446 + echo "$as_me: failed program was:" >&5 4.1447 +sed 's/^/| /' conftest.$ac_ext >&5 4.1448 + 4.1449 +sim_cv_lib_x11_avail=no 4.1450 +fi 4.1451 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4.1452 +fi 4.1453 +echo "$as_me:$LINENO: result: $sim_cv_lib_x11_avail" >&5 4.1454 +echo "${ECHO_T}$sim_cv_lib_x11_avail" >&6 4.1455 + 4.1456 + if test x"$sim_cv_lib_x11_avail" = x"yes"; then 4.1457 + sim_ac_x11_avail=yes 4.1458 + 4.1459 + else 4.1460 + CPPFLAGS=$sim_ac_save_cppflags 4.1461 + LDFLAGS=$sim_ac_save_ldflags 4.1462 + LIBS=$sim_ac_save_libs 4.1463 + 4.1464 + fi 4.1465 +fi 4.1466 + 4.1467 4.1468 : ${sim_ac_have_libungif=false} 4.1469 echo "$as_me:$LINENO: checking for libungif" >&5 4.1470 @@ -23514,7 +24659,7 @@ 4.1471 } >&5 4.1472 cat >&5 <<_CSEOF 4.1473 4.1474 -This file was extended by simage $as_me 1.6.1a, which was 4.1475 +This file was extended by simage $as_me 1.6.1, which was 4.1476 generated by GNU Autoconf 2.57. Invocation command line was 4.1477 4.1478 CONFIG_FILES = $CONFIG_FILES 4.1479 @@ -23577,7 +24722,7 @@ 4.1480 4.1481 cat >>$CONFIG_STATUS <<_ACEOF 4.1482 ac_cs_version="\\ 4.1483 -simage config.status 1.6.1a 4.1484 +simage config.status 1.6.1 4.1485 configured by $0, generated by GNU Autoconf 2.57, 4.1486 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" 4.1487 4.1488 @@ -23874,6 +25019,10 @@ 4.1489 s,@SIMAGE_QIMAGE_SUPPORT_FALSE@,$SIMAGE_QIMAGE_SUPPORT_FALSE,;t t 4.1490 s,@SIMAGE_QUICKTIME_SUPPORT_TRUE@,$SIMAGE_QUICKTIME_SUPPORT_TRUE,;t t 4.1491 s,@SIMAGE_QUICKTIME_SUPPORT_FALSE@,$SIMAGE_QUICKTIME_SUPPORT_FALSE,;t t 4.1492 +s,@X_CFLAGS@,$X_CFLAGS,;t t 4.1493 +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t 4.1494 +s,@X_LIBS@,$X_LIBS,;t t 4.1495 +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t 4.1496 s,@SIMAGE_MPEG2ENC_SUPPORT_TRUE@,$SIMAGE_MPEG2ENC_SUPPORT_TRUE,;t t 4.1497 s,@SIMAGE_MPEG2ENC_SUPPORT_FALSE@,$SIMAGE_MPEG2ENC_SUPPORT_FALSE,;t t 4.1498 s,@SIMAGE_DEBUG_BUILD@,$SIMAGE_DEBUG_BUILD,;t t
5.1 --- a/configure.ac Fri Oct 08 12:30:42 2004 +0000 5.2 +++ b/configure.ac Fri Oct 08 12:42:28 2004 +0000 5.3 @@ -4,7 +4,7 @@ 5.4 m4_define([SIMAGE_MAJOR], [1]) 5.5 m4_define([SIMAGE_MINOR], [6]) 5.6 m4_define([SIMAGE_MICRO], [1]) 5.7 -m4_define([SIMAGE_BETA], [a]) 5.8 +m4_define([SIMAGE_BETA], []) 5.9 m4_define([SIMAGE_VERSION_STRING], 5.10 [SIMAGE_MAJOR.SIMAGE_MINOR.SIMAGE_MICRO[]SIMAGE_BETA]) 5.11
6.1 --- a/guile/Makefile.in Fri Oct 08 12:30:42 2004 +0000 6.2 +++ b/guile/Makefile.in Fri Oct 08 12:42:28 2004 +0000 6.3 @@ -133,6 +133,10 @@ 6.4 STRIP = @STRIP@ 6.5 SUFFIX = @SUFFIX@ 6.6 VERSION = @VERSION@ 6.7 +X_CFLAGS = @X_CFLAGS@ 6.8 +X_EXTRA_LIBS = @X_EXTRA_LIBS@ 6.9 +X_LIBS = @X_LIBS@ 6.10 +X_PRE_LIBS = @X_PRE_LIBS@ 6.11 ac_compiler_gnu = @ac_compiler_gnu@ 6.12 ac_ct_AR = @ac_ct_AR@ 6.13 ac_ct_CC = @ac_ct_CC@
7.1 --- a/mpeg2enc/Makefile.in Fri Oct 08 12:30:42 2004 +0000 7.2 +++ b/mpeg2enc/Makefile.in Fri Oct 08 12:42:28 2004 +0000 7.3 @@ -135,6 +135,10 @@ 7.4 STRIP = @STRIP@ 7.5 SUFFIX = @SUFFIX@ 7.6 VERSION = @VERSION@ 7.7 +X_CFLAGS = @X_CFLAGS@ 7.8 +X_EXTRA_LIBS = @X_EXTRA_LIBS@ 7.9 +X_LIBS = @X_LIBS@ 7.10 +X_PRE_LIBS = @X_PRE_LIBS@ 7.11 ac_compiler_gnu = @ac_compiler_gnu@ 7.12 ac_ct_AR = @ac_ct_AR@ 7.13 ac_ct_CC = @ac_ct_CC@
8.1 --- a/src/Makefile.in Fri Oct 08 12:30:42 2004 +0000 8.2 +++ b/src/Makefile.in Fri Oct 08 12:42:28 2004 +0000 8.3 @@ -132,6 +132,10 @@ 8.4 STRIP = @STRIP@ 8.5 SUFFIX = @SUFFIX@ 8.6 VERSION = @VERSION@ 8.7 +X_CFLAGS = @X_CFLAGS@ 8.8 +X_EXTRA_LIBS = @X_EXTRA_LIBS@ 8.9 +X_LIBS = @X_LIBS@ 8.10 +X_PRE_LIBS = @X_PRE_LIBS@ 8.11 ac_compiler_gnu = @ac_compiler_gnu@ 8.12 ac_ct_AR = @ac_ct_AR@ 8.13 ac_ct_CC = @ac_ct_CC@
