Mercurial > hg > xemacs-beta
comparison configure.in @ 408:501cfd01ee6d r21-2-34
Import from CVS: tag r21-2-34
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:18:11 +0200 |
parents | b8cc9ab3f761 |
children | de805c49cfc1 |
comparison
equal
deleted
inserted
replaced
407:ed6218a7d4d3 | 408:501cfd01ee6d |
---|---|
356 sitelispdir='${datadir}/${inststaticdir}/site-lisp' | 356 sitelispdir='${datadir}/${inststaticdir}/site-lisp' |
357 sitemoduledir='${datadir}/${inststaticdir}/site-modules' | 357 sitemoduledir='${datadir}/${inststaticdir}/site-modules' |
358 pkgdir='${datadir}/${instvardir}/lisp' | 358 pkgdir='${datadir}/${instvardir}/lisp' |
359 package_path='' | 359 package_path='' |
360 etcdir='${datadir}/${instvardir}/etc' | 360 etcdir='${datadir}/${instvardir}/etc' |
361 lockdir='${statedir}/${inststaticdir}/lock' | |
362 archlibdir='${datadir}/${instvardir}/${configuration}' | 361 archlibdir='${datadir}/${instvardir}/${configuration}' |
363 docdir='${archlibdir}' | 362 docdir='${archlibdir}' |
364 with_prefix='yes' | 363 with_prefix='yes' |
365 with_site_lisp='no' | 364 with_site_lisp='no' |
366 with_site_modules='yes' | 365 with_site_modules='yes' |
744 dnl testers, at large sites, have said they have their X files | 743 dnl testers, at large sites, have said they have their X files |
745 dnl installed in odd places. | 744 dnl installed in odd places. |
746 | 745 |
747 dnl Has the user specified one of the path options? | 746 dnl Has the user specified one of the path options? |
748 prefix | exec_prefix | bindir | datadir | statedir | libdir | \ | 747 prefix | exec_prefix | bindir | datadir | statedir | libdir | \ |
749 mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \ | 748 mandir | infodir | infopath | lispdir | etcdir | pkgdir | \ |
750 archlibdir | docdir | package_path ) | 749 archlibdir | docdir | package_path ) |
751 dnl If the value was omitted, get it from the next argument. | 750 dnl If the value was omitted, get it from the next argument. |
752 if test "$valomitted" = "yes"; then | 751 if test "$valomitted" = "yes"; then |
753 if test "$#" = 0; then | 752 if test "$#" = 0; then |
754 USAGE_ERROR("The \`--$optname' option requires a value."); | 753 USAGE_ERROR("The \`--$optname' option requires a value."); |
772 datadir ) | 771 datadir ) |
773 AC_DEFINE(INFODIR_USER_DEFINED) | 772 AC_DEFINE(INFODIR_USER_DEFINED) |
774 AC_DEFINE(LISPDIR_USER_DEFINED) | 773 AC_DEFINE(LISPDIR_USER_DEFINED) |
775 AC_DEFINE(MODULEDIR_USER_DEFINED) | 774 AC_DEFINE(MODULEDIR_USER_DEFINED) |
776 AC_DEFINE(ETCDIR_USER_DEFINED) ;; | 775 AC_DEFINE(ETCDIR_USER_DEFINED) ;; |
777 statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;; | |
778 docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;; | 776 docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;; |
779 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;; | 777 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;; |
780 esac | 778 esac |
781 ;; | 779 ;; |
782 | 780 |
2269 doug_lea_malloc=yes | 2267 doug_lea_malloc=yes |
2270 else | 2268 else |
2271 doug_lea_malloc=no | 2269 doug_lea_malloc=no |
2272 fi | 2270 fi |
2273 after_morecore_hook_exists=yes | 2271 after_morecore_hook_exists=yes |
2274 AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no) | |
2275 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) | 2272 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) |
2276 AC_MSG_CHECKING(whether __after_morecore_hook exists) | 2273 AC_MSG_CHECKING(whether __after_morecore_hook exists) |
2277 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0], | 2274 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0], |
2278 [AC_MSG_RESULT(yes)], | 2275 [AC_MSG_RESULT(yes)], |
2279 [AC_MSG_RESULT(no) | 2276 [AC_MSG_RESULT(no) |
2290 GNU_MALLOC=no | 2287 GNU_MALLOC=no |
2291 GNU_MALLOC_reason=" | 2288 GNU_MALLOC_reason=" |
2292 - User chose to use Debugging Malloc." | 2289 - User chose to use Debugging Malloc." |
2293 fi | 2290 fi |
2294 | 2291 |
2295 if test "$doug_lea_malloc" = "yes" ; then | 2292 if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then |
2296 if test "$GNU_MALLOC" = yes ; then | 2293 GNU_MALLOC_reason=" |
2297 GNU_MALLOC_reason=" | |
2298 - Using Doug Lea's new malloc from the GNU C Library." | 2294 - Using Doug Lea's new malloc from the GNU C Library." |
2299 fi | |
2300 AC_DEFINE(DOUG_LEA_MALLOC) | 2295 AC_DEFINE(DOUG_LEA_MALLOC) |
2301 if test "$after_morecore_hook_exists" = "no" ; then | 2296 if test "$after_morecore_hook_exists" = "no" ; then |
2302 GNU_MALLOC_reason=" | 2297 GNU_MALLOC_reason=" |
2303 - Using Doug Lea's new malloc from the Linux C Library." | 2298 - Using Doug Lea's new malloc from the Linux C Library." |
2304 AC_DEFINE(_NO_MALLOC_WARNING_) | 2299 AC_DEFINE(_NO_MALLOC_WARNING_) |
2305 fi | 2300 fi |
2306 use_minimal_tagbits=yes | |
2307 fi | 2301 fi |
2308 | 2302 |
2309 dnl #### mcheck is broken in all versions of Linux libc and glibc. | 2303 dnl #### mcheck is broken in all versions of Linux libc and glibc. |
2310 dnl Try this again when 2.1 hits the streets. | 2304 dnl Try this again when 2.1 hits the streets. |
2311 dnl Avoid using free-hook.c if support exists for malloc debugging in libc | 2305 dnl Avoid using free-hook.c if support exists for malloc debugging in libc |
4359 *) break ;; | 4353 *) break ;; |
4360 esac | 4354 esac |
4361 done | 4355 done |
4362 AC_SUBST(ETCDIR) | 4356 AC_SUBST(ETCDIR) |
4363 | 4357 |
4364 AC_SUBST(lockdir) | |
4365 AC_SUBST(LOCKDIR_USER_DEFINED) | |
4366 LOCKDIR=$lockdir | |
4367 while true; do | |
4368 case "$LOCKDIR" in | |
4369 *\$* ) eval "LOCKDIR=$LOCKDIR" ;; | |
4370 *) break ;; | |
4371 esac | |
4372 done | |
4373 AC_SUBST(LOCKDIR) | |
4374 | |
4375 AC_SUBST(docdir) | 4358 AC_SUBST(docdir) |
4376 AC_SUBST(DOCDIR_USER_DEFINED) | 4359 AC_SUBST(DOCDIR_USER_DEFINED) |
4377 DOCDIR=$docdir | 4360 DOCDIR=$docdir |
4378 while true; do | 4361 while true; do |
4379 case "$DOCDIR" in | 4362 case "$DOCDIR" in |
4682 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." | 4665 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." |
4683 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." | 4666 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." |
4684 test "$with_socks" = yes && echo " Compiling in support for SOCKS." | 4667 test "$with_socks" = yes && echo " Compiling in support for SOCKS." |
4685 test "$with_dnet" = yes && echo " Compiling in support for DNET." | 4668 test "$with_dnet" = yes && echo " Compiling in support for DNET." |
4686 test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules." | 4669 test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules." |
4687 test "$with_clash_detection" != "no" && \ | |
4688 echo " Clash detection will use \"$lockdir\" for locking files." | |
4689 test "$use_union_type" = yes && echo " Using the union type for Lisp_Objects." | 4670 test "$use_union_type" = yes && echo " Using the union type for Lisp_Objects." |
4690 test "$pdump" = yes && echo " Using the new portable dumper." | 4671 test "$pdump" = yes && echo " Using the new portable dumper." |
4691 test "$debug" = yes && echo " Compiling in support for extra debugging code." | 4672 test "$debug" = yes && echo " Compiling in support for extra debugging code." |
4692 test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." | 4673 test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." |
4693 if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc $error_check_glyphs" \ | 4674 if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc $error_check_glyphs" \ |