comparison configure.in @ 261:405dd6d1825b r20-5b29

Import from CVS: tag r20-5b29
author cvs
date Mon, 13 Aug 2007 10:23:51 +0200
parents 11cf20601dec
children 727739f917cb
comparison
equal deleted inserted replaced
260:052205f7dd5f 261:405dd6d1825b
352 with_x11='' 352 with_x11=''
353 with_gung='no' 353 with_gung='no'
354 with_minimal_tagbits='no' 354 with_minimal_tagbits='no'
355 rel_alloc='default' 355 rel_alloc='default'
356 with_system_malloc='default' 356 with_system_malloc='default'
357 with_dlmalloc='default'
357 native_sound_lib='' 358 native_sound_lib=''
358 dnl use-assertions should be 'yes' by default. Too many people in this 359 dnl use-assertions should be 'yes' by default. Too many people in this
359 dnl world have core dumps turned off by default or \"cannot find where the 360 dnl world have core dumps turned off by default or \"cannot find where the
360 dnl core file went\". At least we should get some useful output ... 361 dnl core file went\". At least we should get some useful output ...
361 use_assertions="yes" 362 use_assertions="yes"
531 eval "$opt=\"$val\"" 532 eval "$opt=\"$val\""
532 ;; 533 ;;
533 534
534 dnl Options that take "yes", "no", or "default" values 535 dnl Options that take "yes", "no", or "default" values
535 rel_alloc | \ 536 rel_alloc | \
537 with_dlmalloc | \
536 with_debug_malloc | use_debug_malloc | \ 538 with_debug_malloc | use_debug_malloc | \
537 with_system_malloc | use_system_malloc ) 539 with_system_malloc | use_system_malloc )
538 case "$val" in 540 case "$val" in
539 y | ye | yes ) val=yes ;; 541 y | ye | yes ) val=yes ;;
540 n | no ) val=no ;; 542 n | no ) val=no ;;
1451 if test "$with_clash_detection" = "yes"; then 1453 if test "$with_clash_detection" = "yes"; then
1452 AC_DEFINE(CLASH_DETECTION) 1454 AC_DEFINE(CLASH_DETECTION)
1453 XE_ADD_OBJS(filelock.o) 1455 XE_ADD_OBJS(filelock.o)
1454 fi 1456 fi
1455 1457
1456 if test "$with_shlib" = "yes"; then 1458 dnl Autodetected below
1457 AC_DEFINE(HAVE_SHLIB) 1459 dnl if test "$with_shlib" = "yes"; then
1458 XE_ADD_OBJS(dlopen.o) 1460 dnl AC_DEFINE(HAVE_SHLIB)
1459 fi 1461 dnl XE_ADD_OBJS(dlopen.o)
1462 dnl fi
1460 1463
1461 dnl Choose a compiler from (in order) 1464 dnl Choose a compiler from (in order)
1462 dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC 1465 dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
1463 test -n "$compiler" && CC="$compiler" 1466 test -n "$compiler" && CC="$compiler"
1464 if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler 1467 if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler
1920 dnl ----------------------------------- 1923 dnl -----------------------------------
1921 1924
1922 dnl Do the opsystem or machine files prohibit the use of the GNU malloc? 1925 dnl Do the opsystem or machine files prohibit the use of the GNU malloc?
1923 dnl Assume not, until told otherwise. 1926 dnl Assume not, until told otherwise.
1924 GNU_MALLOC=yes 1927 GNU_MALLOC=yes
1925 doug_lea_malloc=yes 1928 if test "$with_dlmalloc" != "no"; then
1929 doug_lea_malloc=yes
1930 else
1931 doug_lea_malloc=no
1932 fi
1926 after_morecore_hook_exists=yes 1933 after_morecore_hook_exists=yes
1927 AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no) 1934 AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
1928 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) 1935 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
1929 AC_MSG_CHECKING(whether __after_morecore_hook exists) 1936 AC_MSG_CHECKING(whether __after_morecore_hook exists)
1930 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0], 1937 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
2419 elif test "$with_ldap" = "yes" -a "$with_ns_ldap" = "yes" ; then 2426 elif test "$with_ldap" = "yes" -a "$with_ns_ldap" = "yes" ; then
2420 AC_DEFINE(HAVE_LDAP) 2427 AC_DEFINE(HAVE_LDAP)
2421 AC_DEFINE(HAVE_NS_LDAP) 2428 AC_DEFINE(HAVE_NS_LDAP)
2422 XE_PREPEND(-lldap10, LIBS) 2429 XE_PREPEND(-lldap10, LIBS)
2423 XE_ADD_OBJS(eldap.o) 2430 XE_ADD_OBJS(eldap.o)
2424 dnl else 2431 elif test "$with_ldap" = "yes" ; then
2425 dnl AC_DEFINE(HAVE_LDAP) 2432 AC_DEFINE(HAVE_LDAP)
2426 dnl XE_PREPEND(-lldap, LIBS) 2433 XE_PREPEND(-lldap, LIBS)
2427 dnl XE_ADD_OBJS(eldap.o) 2434 XE_ADD_OBJS(eldap.o)
2428 fi 2435 fi
2429 2436
2430 dnl ---------------------- 2437 dnl ----------------------
2431 dnl X11 Graphics libraries 2438 dnl X11 Graphics libraries
2432 dnl ---------------------- 2439 dnl ----------------------
3213 if test "$usage_tracking" = "yes"; then 3220 if test "$usage_tracking" = "yes"; then
3214 AC_DEFINE(USAGE_TRACKING) 3221 AC_DEFINE(USAGE_TRACKING)
3215 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS) 3222 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
3216 fi 3223 fi
3217 3224
3225 dnl autodetect dll support
3226 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) }
3228 test -z "$with_shlib" && with_shlib=yes
3229 if test "$with_shlib" = "yes"; then
3230 AC_DEFINE(HAVE_SHLIB)
3231 XE_ADD_OBJS(dlopen.o)
3232 XE_PREPEND(-ldl, LIBS)
3233 fi
3234
3235 dnl Process support (hardcoded)
3236 dnl every system that supports this runs configure, the others don't
3237
3238 dnl We're not ready for this yet.
3239 dnl AC_DEFINE(HAVE_UNIX_PROCESSES)
3240 dnl XE_ADD_OBJS(process-unix.o)
3241
3218 dnl -------------------------------- 3242 dnl --------------------------------
3219 dnl Compute SUBST-itutable variables 3243 dnl Compute SUBST-itutable variables
3220 dnl -------------------------------- 3244 dnl --------------------------------
3221 3245
3222 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM) 3246 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM)
3411 else 3435 else
3412 echo "uname -a: `uname -a`" 3436 echo "uname -a: `uname -a`"
3413 fi 3437 fi
3414 echo "" 3438 echo ""
3415 echo "$0 $quoted_arguments" 3439 echo "$0 $quoted_arguments"
3416 ) >> Installation 3440 ) > Installation
3441
3442 xemacs_betaname=""
3443 test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}"
3417 3444
3418 dnl Start stdout redirection to '| tee -a Installation' 3445 dnl Start stdout redirection to '| tee -a Installation'
3419 ( 3446 (
3420 echo " 3447 echo "
3421 3448
3422 Configured for \`$canonical'. 3449 XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" configured for \`$canonical'.
3423 3450
3424 Where should the build process find the source code? $srcdir 3451 Where should the build process find the source code? $srcdir
3425 What installation prefix should install use? $prefix 3452 What installation prefix should install use? $prefix
3426 Where should XEmacs look for packages? $package_path 3453 Where should XEmacs look for packages? $package_path
3427 What operating system and machine description files should XEmacs use? 3454 What operating system and machine description files should XEmacs use?
3519 case "$with_dialogs" in 3546 case "$with_dialogs" in
3520 motif ) echo " Using Motif dialog boxes." ;; 3547 motif ) echo " Using Motif dialog boxes." ;;
3521 athena ) echo " Using Athena dialog boxes." ;; 3548 athena ) echo " Using Athena dialog boxes." ;;
3522 athena3d ) echo " Using Athena-3d dialog boxes." ;; 3549 athena3d ) echo " Using Athena-3d dialog boxes." ;;
3523 esac 3550 esac
3551 test "$with_shlib" = "yes" && echo " Compiling in DLL support."
3524 test "$with_clash_detection" = yes && \ 3552 test "$with_clash_detection" = yes && \
3525 echo " Clash detection will use \"$lockdir\" for locking files." 3553 echo " Clash detection will use \"$lockdir\" for locking files."
3526 echo " movemail will use \"$mail_locking\" for locking mail spool files." 3554 echo " movemail will use \"$mail_locking\" for locking mail spool files."
3527 test "$with_pop" = yes && echo " Using POP for mail access" 3555 test "$with_pop" = yes && echo " Using POP for mail access"
3528 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication" 3556 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication"
3544 echo " WARNING: Error checking is on by default for XEmacs beta releases." 3572 echo " WARNING: Error checking is on by default for XEmacs beta releases."
3545 echo " WARNING: ---------------------------------------------------------" 3573 echo " WARNING: ---------------------------------------------------------"
3546 fi 3574 fi
3547 echo "" 3575 echo ""
3548 ) | tee -a Installation 3576 ) | tee -a Installation
3549 echo "The above configure report is appended to \"Installation\" file." 3577 dnl echo "The above configure report is appended to \"Installation\" file."
3550 echo "" 3578 echo ""
3579
3580 dnl Generate Installation.el
3581 echo '(setq Installation-string "' > Installation.el
3582 sed 's/"/\\"/g' Installation >> Installation.el
3583 echo '")' >> Installation.el
3551 3584
3552 dnl ----------------------------------- 3585 dnl -----------------------------------
3553 dnl Now generate config.h and Makefiles 3586 dnl Now generate config.h and Makefiles
3554 dnl ----------------------------------- 3587 dnl -----------------------------------
3555 3588