comparison configure.in @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17
author cvs
date Mon, 13 Aug 2007 09:53:19 +0200
parents 9ad43877534d
children e121b013d1f0
comparison
equal deleted inserted replaced
180:add28d59e586 181:bfd6434d15b3
94 94
95 95
96 dnl Avoid spurious cross-compiling warnings from AC_TRY_RUN 96 dnl Avoid spurious cross-compiling warnings from AC_TRY_RUN
97 dnl XEmacs is unlikely to ever cross-compile 97 dnl XEmacs is unlikely to ever cross-compile
98 define([AC_TRY_RUN],[AC_TRY_RUN_NATIVE([$1], [$2], [$3])])dnl 98 define([AC_TRY_RUN],[AC_TRY_RUN_NATIVE([$1], [$2], [$3])])dnl
99
100 99
101 dnl Redefine AC_DEFINE* to provide more output if extra_verbose 100 dnl Redefine AC_DEFINE* to provide more output if extra_verbose
102 dnl Set VARIABLE to VALUE, verbatim, or 1. 101 dnl Set VARIABLE to VALUE, verbatim, or 1.
103 dnl AC_DEFINE(VARIABLE [, VALUE]) 102 dnl AC_DEFINE(VARIABLE [, VALUE])
104 define([AC_DEFINE], 103 define([AC_DEFINE],
239 238
240 define([AC_INIT_PARSE_ARGS],[ 239 define([AC_INIT_PARSE_ARGS],[
241 dnl Initialize some variables set by options. 240 dnl Initialize some variables set by options.
242 dnl The variables have the same names as the options, with 241 dnl The variables have the same names as the options, with
243 dnl dashes changed to underlines. 242 dnl dashes changed to underlines.
244 build=NONE
245 exec_prefix=NONE 243 exec_prefix=NONE
246 host=NONE 244 host=NONE
247 no_create= 245 no_create=
248 nonopt=NONE 246 nonopt=NONE
249 no_recursion= 247 no_recursion=
345 puresize='' 343 puresize=''
346 cflags='UNSPECIFIED' 344 cflags='UNSPECIFIED'
347 dynamic='' 345 dynamic=''
348 with_x11='' 346 with_x11=''
349 rel_alloc='default' 347 rel_alloc='default'
350 use_system_malloc='default' 348 with_system_malloc='default'
351 energize_version='' 349 energize_version=''
352 native_sound_lib='' 350 native_sound_lib=''
353 dnl use-assertions should be 'yes' by default. Too many people in this 351 dnl use-assertions should be 'yes' by default. Too many people in this
354 dnl world have core dumps turned off by default or \"cannot find where the 352 dnl world have core dumps turned off by default or \"cannot find where the
355 dnl core file went\". At least we should get some useful output ... 353 dnl core file went\". At least we should get some useful output ...
544 --puresize=VALUE Override default amount of space for pure Lisp code. 542 --puresize=VALUE Override default amount of space for pure Lisp code.
545 --rel-alloc Use the relocating allocator (default for this option 543 --rel-alloc Use the relocating allocator (default for this option
546 is system-dependent). 544 is system-dependent).
547 --with-clash-detection Use lock files to detect multiple edits of the same file. 545 --with-clash-detection Use lock files to detect multiple edits of the same file.
548 The default is to not do clash detection. 546 The default is to not do clash detection.
549 --use-system-malloc Force use of the system malloc, rather than GNU 547 --with-system-malloc Force use of the system malloc, rather than GNU malloc.
550 malloc. 548 --with-debug-malloc Use the debugging malloc package.
551 --use-debug-malloc Use the debugging malloc package.
552 549
553 You may also specify any of the \`path' variables found in 550 You may also specify any of the \`path' variables found in
554 Makefile.in, including --bindir, --libdir, --lispdir, --datadir, and 551 Makefile.in, including --bindir, --libdir, --lispdir, --datadir, and
555 so on. Note that we recommend against explicitly setting any of these 552 so on. Note that we recommend against explicitly setting any of these
556 variables. See the INSTALL file for a complete list plus the reasons 553 variables. See the INSTALL file for a complete list plus the reasons
725 eval "$opt=\"$val\"" 722 eval "$opt=\"$val\""
726 ;; 723 ;;
727 724
728 dnl Options that take "yes", "no", or "default" values 725 dnl Options that take "yes", "no", or "default" values
729 rel_alloc | \ 726 rel_alloc | \
730 use_debug_malloc | \ 727 with_debug_malloc | use_debug_malloc | \
731 use_system_malloc ) 728 with_system_malloc | use_system_malloc )
732 case "$val" in 729 case "$val" in
733 y | ye | yes ) val=yes ;; 730 y | ye | yes ) val=yes ;;
734 n | no ) val=no ;; 731 n | no ) val=no ;;
735 d | de | def | defa | defau | defaul | default ) 732 d | de | def | defa | defau | defaul | default ) val=default ;;
736 val=default ;;
737 * ) USAGE_ERROR(["The \`--$optname' option requires one of these values: 733 * ) USAGE_ERROR(["The \`--$optname' option requires one of these values:
738 \`yes', \`no', or \`default'."]) ;; 734 \`yes', \`no', or \`default'."]) ;;
739 esac 735 esac
736 case "$opt" in use_* ) opt="`echo $opt | sed /use/with/`" ;; esac
740 eval "$opt=\"$val\"" 737 eval "$opt=\"$val\""
741 ;; 738 ;;
742 739
743 dnl Has the user requested database support? 740 dnl Has the user requested database support?
744 "with_database" ) 741 "with_database" )
1022 echo Making symbolic link to "$srcdir/$dir" 1019 echo Making symbolic link to "$srcdir/$dir"
1023 ${LN_S} "$srcdir/$dir" "$dir" 1020 ${LN_S} "$srcdir/$dir" "$dir"
1024 fi 1021 fi
1025 done 1022 done
1026 1023
1024 dnl Calculate canonical name for blddir (i.e. current directory).
1025 dnl PWD may already be the preferable absolute name for ".",
1026 dnl but we can't trust it - it is sometimes inaccurate.
1027 absolute_pwd="`pwd`";
1028 if test -n "$PWD" && "`cd $PWD && pwd`" = "$absolute_pwd"
1029 then blddir="$PWD"
1030 else blddir="$absolute_pwd"
1031 fi
1032 AC_SUBST(blddir)
1033
1027 dnl Make srcdir absolute, if not already. It is important to 1034 dnl Make srcdir absolute, if not already. It is important to
1028 dnl avoid running the path through pwd unnecessary, since pwd can 1035 dnl avoid running the path through pwd unnecessary, since pwd can
1029 dnl give you automounter prefixes, which can go away. 1036 dnl give you automounter prefixes, which can go away.
1030 case "$srcdir" in 1037 case "$srcdir" in
1031 /* ) ;; 1038 /* ) ;;
1032 . ) 1039 . ) srcdir="$blddir" ;;
1033 dnl We may be able to use the $PWD environment variable to make this 1040 * ) srcdir="`cd $srcdir && pwd`" ;;
1034 dnl absolute. But sometimes PWD is inaccurate.
1035 if test "$PWD" != "" -a "`(cd $PWD ; sh -c pwd)`" = "`pwd`"; then
1036 srcdir="$PWD"
1037 else
1038 srcdir="`(cd $srcdir && pwd)`"
1039 fi
1040 ;;
1041 * ) srcdir="`(cd $srcdir && pwd)`" ;;
1042 esac 1041 esac
1043 1042
1044 dnl Check if the source directory already has a configured system in it. 1043 dnl Check if the source directory already has a configured system in it.
1045 if test `pwd` != `sh -c cd $srcdir && pwd` \ 1044 if test `pwd` != `sh -c cd $srcdir && pwd` \
1046 && test -f "$srcdir/src/config.h"; then 1045 && test -f "$srcdir/src/config.h"; then
2059 GNU_MALLOC=yes 2058 GNU_MALLOC=yes
2060 if test "$system_malloc" = "yes" ; then 2059 if test "$system_malloc" = "yes" ; then
2061 GNU_MALLOC=no 2060 GNU_MALLOC=no
2062 GNU_MALLOC_reason=" 2061 GNU_MALLOC_reason="
2063 (The GNU allocators don't work with this system configuration)." 2062 (The GNU allocators don't work with this system configuration)."
2064 elif test "$use_system_malloc" = "yes" ; then 2063 elif test "$with_system_malloc" = "yes" ; then
2065 GNU_MALLOC=no 2064 GNU_MALLOC=no
2066 GNU_MALLOC_reason=" 2065 GNU_MALLOC_reason="
2067 (User chose not to use GNU allocators)." 2066 (User chose not to use GNU allocators)."
2068 elif test "$use_debug_malloc" = "yes" ; then 2067 elif test "$with_debug_malloc" = "yes" ; then
2069 GNU_MALLOC=no 2068 GNU_MALLOC=no
2070 GNU_MALLOC_reason=" 2069 GNU_MALLOC_reason="
2071 (User chose to use Debugging Malloc)." 2070 (User chose to use Debugging Malloc)."
2072 fi 2071 fi
2073 2072
3194 #ifdef WE_DONT_NEED_QUADS 3193 #ifdef WE_DONT_NEED_QUADS
3195 typedef uint64_t u_int64_t; 3194 typedef uint64_t u_int64_t;
3196 #endif 3195 #endif
3197 #endif 3196 #endif
3198 #include <$path> 3197 #include <$path>
3198 #ifdef DB_VERSION_MAJOR
3199 #if DB_VERSION_MAJOR > 1
3200 choke me;
3201 #endif
3202 #endif
3199 ],[], db_h_path="$path"; break) 3203 ],[], db_h_path="$path"; break)
3200 done 3204 done
3201 test -z "$db_h_path" && with_database_berkdb=no 3205 test -z "$db_h_path" && with_database_berkdb=no
3202 fi 3206 fi
3203 if test "$with_database_berkdb" = "yes"; then 3207 if test "$with_database_berkdb" = "yes"; then
3388 dnl so that the user gets immediate feedback on the results of the 3392 dnl so that the user gets immediate feedback on the results of the
3389 dnl autodetection. 3393 dnl autodetection.
3390 3394
3391 test -n "$puresize" && AC_DEFINE_UNQUOTED(RAW_PURESIZE, $puresize) 3395 test -n "$puresize" && AC_DEFINE_UNQUOTED(RAW_PURESIZE, $puresize)
3392 3396
3393 if test "$GNU_MALLOC" = "yes"; then AC_DEFINE(GNU_MALLOC) 3397 if test "$GNU_MALLOC" = "yes"; then AC_DEFINE(GNU_MALLOC)
3394 elif test "$use_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC) 3398 elif test "$with_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC)
3395 elif test "$use_debug_malloc" = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC) 3399 elif test "$with_debug_malloc" = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC)
3396 AC_DEFINE(USE_SYSTEM_MALLOC) 3400 AC_DEFINE(USE_SYSTEM_MALLOC)
3397 fi 3401 fi
3398 test "$with_i18n3" = "yes" && AC_DEFINE(I18N3) 3402 test "$with_i18n3" = "yes" && AC_DEFINE(I18N3)
3399 test "$GCC" = "yes" && AC_DEFINE(USE_GCC) 3403 test "$GCC" = "yes" && AC_DEFINE(USE_GCC)
3400 test "$with_term" = "yes" && AC_DEFINE(HAVE_TERM) 3404 test "$with_term" = "yes" && AC_DEFINE(HAVE_TERM)
3401 test "$external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET) 3405 test "$external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
3558 exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'` 3562 exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'`
3559 3563
3560 dnl Build Makefile.in's from Makefile.in.in's 3564 dnl Build Makefile.in's from Makefile.in.in's
3561 dnl except ./Makefile from $srcdir/Makefile.in 3565 dnl except ./Makefile from $srcdir/Makefile.in
3562 3566
3563 AC_OUTPUT($internal_makefile_list,[ 3567 AC_OUTPUT($internal_makefile_list lib-src/config.values,[
3564 for dir in $MAKE_SUBDIR; do 3568 for dir in $MAKE_SUBDIR; do
3565 echo creating $dir/Makefile 3569 echo creating $dir/Makefile
3566 ( 3570 (
3567 changequote(<<, >>)dnl 3571 changequote(<<, >>)dnl
3568 cd $dir 3572 cd $dir
3596 rm -f junk.c junk.cpp 3600 rm -f junk.c junk.cpp
3597 changequote([, ])dnl 3601 changequote([, ])dnl
3598 ) 3602 )
3599 done 3603 done
3600 3604
3601 dnl Create a file of config variables for use by the lisp code 3605 dnl Append AC_DEFINE information to lib-src/config.values
3602 sed < config.status > lib-src/config.values \ 3606 dnl (AC_SUBST information is already there (see config.values.sh).
3603 -e 's/^s%@\(.*\)@%\(.*\)%g$/\1 "\2"/p' \ 3607 sed < config.status >> lib-src/config.values \
3604 -e '/{ac_dA}.*{ac_dB}.*{ac_dC}.*{ac_dD}$/!d' \ 3608 -e '/{ac_dA}.*{ac_dB}.*{ac_dC}.*{ac_dD}$/!d' \
3605 -e 's/\${ac_dA}\(.*\)\${ac_dB}.*\${ac_dC}\(.*\)\${ac_dD}/\1 \2/' \ 3609 -e 's/\${ac_dA}\(.*\)\${ac_dB}.*\${ac_dC}\(.*\)\${ac_dD}/\1 \2/' \
3606 -e 's/^\([[^ ]]*\) $/\1 ""/' \ 3610 -e 's/^\([[^ ]]*\) $/\1 ""/' \
3607 -e 's/ 1$/ t/' 3611 -e 's/ 1$/ t/'
3608 3612
3609 ], 3613 ],
3610 [CPP="$CPP" 3614 [CPP="$CPP"
3611 CPPFLAGS="$CPPFLAGS" 3615 CPPFLAGS="$CPPFLAGS"
3612 top_srcdir="$srcdir" 3616 top_srcdir="$srcdir"