comparison configure.in @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 405dd6d1825b
children 8efd647ea9ca
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
348 const_is_losing='yes' 348 const_is_losing='yes'
349 puresize='' 349 puresize=''
350 cflags='UNSPECIFIED' 350 cflags='UNSPECIFIED'
351 dynamic='' 351 dynamic=''
352 with_x11='' 352 with_x11=''
353 with_msw=''
353 with_gung='no' 354 with_gung='no'
354 with_minimal_tagbits='no' 355 with_minimal_tagbits='no'
355 rel_alloc='default' 356 rel_alloc='default'
356 with_system_malloc='default' 357 with_system_malloc='default'
357 with_dlmalloc='default' 358 with_dlmalloc='default'
447 448
448 dnl Process (many) boolean options 449 dnl Process (many) boolean options
449 run_in_place | \ 450 run_in_place | \
450 with_x | \ 451 with_x | \
451 with_x11 | \ 452 with_x11 | \
453 with_msw | \
452 with_gcc | \ 454 with_gcc | \
453 with_gnu_make | \ 455 with_gnu_make | \
454 dynamic | \ 456 dynamic | \
455 with_gung | \ 457 with_gung | \
456 with_ncurses | \ 458 with_ncurses | \
2151 case "$with_x11" in 2153 case "$with_x11" in
2152 yes ) window_system=x11 HAVE_X_WINDOWS=yes ;; 2154 yes ) window_system=x11 HAVE_X_WINDOWS=yes ;;
2153 no ) window_system=none HAVE_X_WINDOWS=no ;; 2155 no ) window_system=none HAVE_X_WINDOWS=no ;;
2154 esac 2156 esac
2155 2157
2156 if test "$window_system" = "none" && test -z "$with_tty"; then 2158 if test "$with_msw" != "no"; then
2157 AC_CHECKING(for MS-Windows) 2159 AC_CHECKING(for MS-Windows)
2158 AC_CHECK_LIB(gdi32,main,have_msw=yes) 2160 AC_CHECK_LIB(gdi32,main,with_msw=yes)
2159 if test "$have_msw" = "yes"; then 2161 if test "$with_msw" = "yes"; then
2160 AC_DEFINE(HAVE_MS_WINDOWS) 2162 AC_DEFINE(HAVE_MS_WINDOWS)
2161 XE_APPEND(-lshell32 -lgdi32 -luser32, libs_system) 2163 XE_APPEND(-lshell32 -lgdi32 -luser32, libs_system)
2162 window_system=msw 2164 if test "$window_system" != x11; then
2163 test "$with_scrollbars" != "no" && with_scrollbars=msw && XE_ADD_OBJS(scrollbar-msw.o) 2165 window_system=msw
2164 test "$with_menubars" != "no" && with_menubars=msw && XE_ADD_OBJS(menubar-msw.o) 2166 test "$with_scrollbars" != "no" && with_scrollbars=msw \
2165 with_dialogs=msw 2167 && XE_ADD_OBJS(scrollbar-msw.o)
2166 with_toolbars=no 2168 test "$with_menubars" != "no" && with_menubars=msw \
2167 with_tty=no 2169 && XE_ADD_OBJS(menubar-msw.o)
2170 with_dialogs=msw
2171 with_toolbars=no
2172 else
2173 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
2174 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o)
2175 fi
2168 const_is_losing=no 2176 const_is_losing=no
2169 with_file_coding=yes 2177 with_file_coding=yes
2170 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o gif_err.o gifalloc.o dgif_lib.o) 2178 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o)
2171 fi 2179 fi
2172 fi 2180 fi
2173 2181
2174 if test "$with_x11" = "yes"; then 2182 if test "$with_x11" = "yes"; then
2175 AC_DEFINE(HAVE_X_WINDOWS) 2183 AC_DEFINE(HAVE_X_WINDOWS)
3222 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS) 3230 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
3223 fi 3231 fi
3224 3232
3225 dnl autodetect dll support 3233 dnl autodetect dll support
3226 test -z "$with_shlib" && { AC_CHECK_HEADER(dlfcn.h, ,with_shlib=no) } 3234 test -z "$with_shlib" && { AC_CHECK_HEADER(dlfcn.h, ,with_shlib=no) }
3227 test -z "$with_shlib" && { AC_CHECK_LIB(dl, dlopen,[:],with_shlib=no) } 3235 test -z "$with_shlib" && { AC_CHECK_LIB(dl, dlopen, XE_PREPEND(-ldl, LIBS),
3236 AC_CHECK_LIB(c, dlopen, with_shlib=yes, with_shlib=no)) }
3228 test -z "$with_shlib" && with_shlib=yes 3237 test -z "$with_shlib" && with_shlib=yes
3229 if test "$with_shlib" = "yes"; then 3238 if test "$with_shlib" = "yes"; then
3230 AC_DEFINE(HAVE_SHLIB) 3239 AC_DEFINE(HAVE_SHLIB)
3231 XE_ADD_OBJS(dlopen.o) 3240 XE_ADD_OBJS(dlopen.o)
3232 XE_PREPEND(-ldl, LIBS) 3241 ld_dynamic_link_flags=
3242 dnl Fill this in with other values as this gets more testing
3243 case "$opsys" in
3244 linux*) ld_dynamic_link_flags="-rdynamic" ;;
3245 *) ;;
3246 esac
3233 fi 3247 fi
3234 3248
3235 dnl Process support (hardcoded) 3249 dnl Process support (hardcoded)
3236 dnl every system that supports this runs configure, the others don't 3250 dnl every system that supports this runs configure, the others don't
3237 3251
3238 dnl We're not ready for this yet. 3252 dnl We're not ready for this yet.
3239 dnl AC_DEFINE(HAVE_UNIX_PROCESSES) 3253 AC_DEFINE(HAVE_UNIX_PROCESSES)
3240 dnl XE_ADD_OBJS(process-unix.o) 3254 XE_ADD_OBJS(process-unix.o)
3241 3255
3242 dnl -------------------------------- 3256 dnl --------------------------------
3243 dnl Compute SUBST-itutable variables 3257 dnl Compute SUBST-itutable variables
3244 dnl -------------------------------- 3258 dnl --------------------------------
3245 3259
3345 AC_SUBST(archlibdir) 3359 AC_SUBST(archlibdir)
3346 AC_SUBST(archlibdir_user_defined) 3360 AC_SUBST(archlibdir_user_defined)
3347 AC_SUBST(docdir) 3361 AC_SUBST(docdir)
3348 AC_SUBST(bitmapdir) 3362 AC_SUBST(bitmapdir)
3349 AC_SUBST(extra_objs) 3363 AC_SUBST(extra_objs)
3364 AC_SUBST(ld_dynamic_link_flags)
3350 3365
3351 dnl The following flags combine all the information from: 3366 dnl The following flags combine all the information from:
3352 dnl - command line options (user always gets priority) 3367 dnl - command line options (user always gets priority)
3353 dnl - user environment variables 3368 dnl - user environment variables
3354 dnl - determined by configure 3369 dnl - determined by configure