Mercurial > hg > xemacs-beta

comparison configure.in @ 173:8eaf7971accc r20-3b13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b13
author cvs
date Mon, 13 Aug 2007 09:49:09 +0200
parents 929b76928fce
children 2d532a89d707
comparison
equal deleted inserted replaced
172:a38aed19690b 173:8eaf7971accc
197 dnl ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' 197 dnl ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
198 dnl # $c_switch_x_machine $c_switch_x_system 198 dnl # $c_switch_x_machine $c_switch_x_system
199 dnl # $ld_switch_x_machine $ld_switch_x_system 199 dnl # $ld_switch_x_machine $ld_switch_x_system
200 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' 200 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
201 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' 201 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
202 xe_libs='$xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard' 202 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
203 ac_cpp='$CPP '"$xe_cppflags" 203 ac_cpp='$CPP '"$xe_cppflags"
204 ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC' 204 ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC'
205 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC' 205 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC'
206 cross_compiling=no 206 cross_compiling=no
207 ]) 207 ])
536 Other options: 536 Other options:
537 537
538 --puresize=VALUE Override default amount of space for pure Lisp code. 538 --puresize=VALUE Override default amount of space for pure Lisp code.
539 --rel-alloc Use the relocating allocator (default for this option 539 --rel-alloc Use the relocating allocator (default for this option
540 is system-dependent). 540 is system-dependent).
541 --with-clash-detection Use lock files to detect multiple edits of the same file.
542 The default is to not do clash detection.
541 --use-system-malloc Force use of the system malloc, rather than GNU 543 --use-system-malloc Force use of the system malloc, rather than GNU
542 malloc. 544 malloc.
543 545
544 You may also specify any of the \`path' variables found in 546 You may also specify any of the \`path' variables found in
545 Makefile.in, including --bindir, --libdir, --lispdir, --datadir, and 547 Makefile.in, including --bindir, --libdir, --lispdir, --datadir, and
677 usage_tracking | \ 679 usage_tracking | \
678 use_union_type | \ 680 use_union_type | \
679 debug | \ 681 debug | \
680 use_assertions | \ 682 use_assertions | \
681 memory_usage_stats | \ 683 memory_usage_stats | \
684 with_clash_detection | \
682 no_doc_file ) 685 no_doc_file )
683 dnl Make sure the value given was either "yes" or "no". 686 dnl Make sure the value given was either "yes" or "no".
684 case "$val" in 687 case "$val" in
685 y | ye | yes ) val=yes ;; 688 y | ye | yes ) val=yes ;;
686 n | no ) val=no ;; 689 n | no ) val=no ;;
695 compiler | \ 698 compiler | \
696 cflags | \ 699 cflags | \
697 puresize | \ 700 puresize | \
698 cache_file | \ 701 cache_file | \
699 native_sound_lib | \ 702 native_sound_lib | \
703 package_path | \
700 x_includes | \ 704 x_includes | \
701 x_libraries | \ 705 x_libraries | \
702 site_includes | \ 706 site_includes | \
703 site_libraries | \ 707 site_libraries | \
704 site_runtime_libraries ) 708 site_runtime_libraries )
1037 1041
1038 dnl ---------------------------------------- 1042 dnl ----------------------------------------
1039 dnl Find out which version of XEmacs this is 1043 dnl Find out which version of XEmacs this is
1040 dnl ---------------------------------------- 1044 dnl ----------------------------------------
1041 . "$srcdir/version.sh" || exit 1; 1045 . "$srcdir/version.sh" || exit 1;
1046 dnl Must do the following first to determine verbosity for AC_DEFINE
1047 if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi
1048 : "${extra_verbose=$beta}"
1042 version="${emacs_major_version}.${emacs_minor_version}" 1049 version="${emacs_major_version}.${emacs_minor_version}"
1043 AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) 1050 AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version)
1044 AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) 1051 AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version)
1045 if test -n "$emacs_beta_version"; then 1052 if test -n "$emacs_beta_version"; then
1046 version="${version}-b${emacs_beta_version}" 1053 version="${version}-b${emacs_beta_version}"
1047 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) 1054 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
1048 fi 1055 fi
1049 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") 1056 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
1050 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 1057 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
1051 canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'`
1052 AC_DEFINE_UNQUOTED(CANONICAL_VERSION, $canonical_version)
1053 1058
1054 dnl ---------------------------------- 1059 dnl ----------------------------------
1055 dnl Error checking and debugging flags 1060 dnl Error checking and debugging flags
1056 dnl ---------------------------------- 1061 dnl ----------------------------------
1057 dnl Error checking default to "yes" in beta versions, to "no" in releases. 1062 dnl Error checking default to "yes" in beta versions, to "no" in releases.
1060 test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) 1065 test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
1061 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK) 1066 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK)
1062 test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS) 1067 test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS)
1063 test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) 1068 test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
1064 test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) 1069 test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
1065 : "${extra_verbose=$beta}"
1066 dnl debug=yes must be set when error checking is present. This should be 1070 dnl debug=yes must be set when error checking is present. This should be
1067 dnl fixed up. 1071 dnl fixed up.
1068 dnl debug implies other options 1072 dnl debug implies other options
1069 if test "${debug=beta}" = "yes"; then 1073 if test "${debug=beta}" = "yes"; then
1070 use_assertions=yes memory_usage_stats=yes 1074 use_assertions=yes memory_usage_stats=yes
1568 echo "$progname: Check \`etc/MACHINES' for recognized configuration names." 1572 echo "$progname: Check \`etc/MACHINES' for recognized configuration names."
1569 ) >&2 1573 ) >&2
1570 exit 1 1574 exit 1
1571 fi 1575 fi
1572 1576
1573 if test "$dynamic" = "yes" ; then 1577 if test -z "$dynamic"; then
1578 case "$opsys" in
1579 hpux* | sunos4* | sco5 ) dynamic=no ;;
1580 *) dynamic=yes ;;
1581 esac
1582 fi
1583 if test "$dynamic" = "yes"; then
1574 case "$opsys" in 1584 case "$opsys" in
1575 hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;; 1585 hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;;
1586 decosf* ) ld_call_shared="-call_shared" ;;
1576 esac 1587 esac
1577 elif test "$dynamic" = "no" ; then 1588 else dnl "$dynamic" = "no"
1578 case "$opsys" in 1589 case "$opsys" in
1579 sol2 | decosf1-3 | decosf3-* | decosf4-* | linux ) opsys="${opsys}-static" ;; 1590 sol2 )
1591 echo "Static linking is not supported on Solaris 2."
1592 echo "Rerun configure without specifying --dynamic=no."
1593 exit 1 ;;
1594 linux ) ld_call_shared="-Bstatic" ;;
1595 decosf* ) ld_call_shared="-non_shared" ;;
1580 esac 1596 esac
1581 fi 1597 fi
1598
1599 canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'`
1600 AC_DEFINE_UNQUOTED(CANONICAL_VERSION, $canonical_version)
1582 1601
1583 machfile="m/${machine}.h" 1602 machfile="m/${machine}.h"
1584 opsysfile="s/${opsys}.h" 1603 opsysfile="s/${opsys}.h"
1585 1604
1586 dnl -------------------------------------------------- 1605 dnl --------------------------------------------------
1701 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system) 1720 CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system)
1702 CPP_to_sh(LD_SWITCH_X_SYSTEM, ld_switch_x_system) 1721 CPP_to_sh(LD_SWITCH_X_SYSTEM, ld_switch_x_system)
1703 1722
1704 CPP_to_sh(UNEXEC, unexec, unexec.o) 1723 CPP_to_sh(UNEXEC, unexec, unexec.o)
1705 1724
1706 CPP_to_sh(LD_SWITCH_CALL_SHARED, ld_switch_call_shared)
1707 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c) 1725 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c)
1708 1726
1709 #ifdef ORDINARY_LINK 1727 #ifdef ORDINARY_LINK
1710 #define LD "$(CC) $(CFLAGS)" 1728 #define LD "$(CC) $(CFLAGS)"
1711 #else /* no ORDINARY LINK */ 1729 #else /* no ORDINARY LINK */
1790 dnl For debugging... 1808 dnl For debugging...
1791 test "$extra_verbose" = "yes" && \ 1809 test "$extra_verbose" = "yes" && \
1792 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard 1810 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
1793 objects_machine objects_system c_switch_machine c_switch_system 1811 objects_machine objects_system c_switch_machine c_switch_system
1794 c_switch_x_system ld_switch_machine ld_switch_system 1812 c_switch_x_system ld_switch_machine ld_switch_system
1795 ld_switch_x_system unexec ld_switch_call_shared ld_switch_shared 1813 ld_switch_x_system unexec ld_switch_shared
1796 ld lib_gcc ld_text_start_addr start_files ordinary_link 1814 ld lib_gcc ld_text_start_addr start_files ordinary_link
1797 have_terminfo mail_use_flock mail_use_lockf) && echo "" 1815 have_terminfo mail_use_flock mail_use_lockf) && echo ""
1798
1799 1816
1800 dnl Non-ordinary link usually requires -lc 1817 dnl Non-ordinary link usually requires -lc
1801 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" 1818 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
1802 1819
1803 dnl Calculalate value of CFLAGS: 1820 dnl Calculalate value of CFLAGS:
1804 dnl Use either command line flag, environment var, or autodetection 1821 dnl Use either command line flag, environment var, or autodetection
1805 if test -z "$CFLAGS"; then 1822 if test -z "$CFLAGS"; then
1806 dnl Following values of CFLAGS are known to work well. 1823 dnl Following values of CFLAGS are known to work well.
1807 dnl Should we take debugging options into consideration? 1824 dnl Should we take debugging options into consideration?
1808 if test "$GCC" = "yes"; then 1825 if test "$GCC" = "yes"; then
1809 CFLAGS="-g -O2" 1826 CFLAGS="-g -O2 -Wall"
1810 test "$opsys" = "linux" -a "$machine" = "intel386" && \ 1827 test "$opsys" = "linux" -a "$machine" = "intel386" && \
1811 CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2" 1828 CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
1812 elif test "$__sunpro_c" = "yes"; then 1829 elif test "$__sunpro_c" = "yes"; then
1813 case "$opsys" in 1830 case "$opsys" in
1814 sol2 ) CFLAGS="-v -xO4" ;; 1831 sol2 ) CFLAGS="-v -xO4" ;;
1831 esac 1848 esac
1832 done])dnl 1849 done])dnl
1833 XE_GCC_WRAP_LDFLAGS(ld_switch_system) 1850 XE_GCC_WRAP_LDFLAGS(ld_switch_system)
1834 XE_GCC_WRAP_LDFLAGS(ld_switch_machine) 1851 XE_GCC_WRAP_LDFLAGS(ld_switch_machine)
1835 XE_GCC_WRAP_LDFLAGS(LDFLAGS) 1852 XE_GCC_WRAP_LDFLAGS(LDFLAGS)
1853 XE_GCC_WRAP_LDFLAGS(ld_call_shared)
1836 fi 1854 fi
1837 1855
1838 dnl Add s&m-determined objects (including unexec) to link line 1856 dnl Add s&m-determined objects (including unexec) to link line
1839 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine) 1857 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine)
1840 test -n "$objects_system" && XE_ADD_OBJS($objects_system) 1858 test -n "$objects_system" && XE_ADD_OBJS($objects_system)
1856 dnl Dynodump requires the system linker 1874 dnl Dynodump requires the system linker
1857 test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker, ld_switch_site) 1875 test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker, ld_switch_site)
1858 fi 1876 fi
1859 1877
1860 dnl Feed s&m crud to src/Makefile 1878 dnl Feed s&m crud to src/Makefile
1861 AC_SUBST(ld_switch_call_shared)
1862 AC_SUBST(ld_switch_shared) 1879 AC_SUBST(ld_switch_shared)
1863 AC_SUBST(start_files) 1880 AC_SUBST(start_files)
1864 test -n "$ld_text_start_addr" && start_flags="-T $ld_text_start_addr -e __start" 1881 test -n "$ld_text_start_addr" && start_flags="-T $ld_text_start_addr -e __start"
1865 AC_SUBST(start_flags) 1882 AC_SUBST(start_flags)
1866 if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then 1883 if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then
3282 AC_SUBST(ld_libs_all) 3299 AC_SUBST(ld_libs_all)
3283 AC_SUBST(libsrc_libs) 3300 AC_SUBST(libsrc_libs)
3284 AC_SUBST(CFLAGS) 3301 AC_SUBST(CFLAGS)
3285 AC_SUBST(CPPFLAGS) 3302 AC_SUBST(CPPFLAGS)
3286 AC_SUBST(LDFLAGS) 3303 AC_SUBST(LDFLAGS)
3304 RECURSIVE_MAKE="\$(MAKE) \$(MFLAGS) CC='\$(CC)' CFLAGS='\$(CFLAGS)' LDFLAGS='\$(LDFLAGS)' CPPFLAGS='\$(CPPFLAGS)'"
3305 AC_SUBST(RECURSIVE_MAKE)
3287 3306
3288 AC_SUBST(native_sound_lib) 3307 AC_SUBST(native_sound_lib)
3289 AC_SUBST(sound_cflags) 3308 AC_SUBST(sound_cflags)
3290 AC_SUBST(RANLIB) 3309 AC_SUBST(RANLIB)
3291 AC_SUBST(dynodump_arch) 3310 AC_SUBST(dynodump_arch)
3292 3311
3312
3313 dnl change blanks to colons in package path, and make available to config.h
3314 if test -n "$package_path"; then
3315 package_path=`echo $package_path | sed 'y/ /:/'`
3316 AC_DEFINE_UNQUOTED(PACKAGE_PATH, "$package_path")
3317 fi
3318
3293 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical") 3319 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical")
3320 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}")
3294 AC_DEFINE_UNQUOTED(config_machfile, "$machfile") 3321 AC_DEFINE_UNQUOTED(config_machfile, "$machfile")
3295 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile") 3322 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")
3296 3323
3297 dnl Following are deprecated 3324 dnl Following are deprecated
3298 3325
3323 test "$const_is_losing" = "yes" && AC_DEFINE(CONST_IS_LOSING) 3350 test "$const_is_losing" = "yes" && AC_DEFINE(CONST_IS_LOSING)
3324 test "$with_quantify" = "yes" && AC_DEFINE(QUANTIFY) 3351 test "$with_quantify" = "yes" && AC_DEFINE(QUANTIFY)
3325 test "$with_pop" = "yes" && AC_DEFINE(MAIL_USE_POP) 3352 test "$with_pop" = "yes" && AC_DEFINE(MAIL_USE_POP)
3326 test "$with_kerberos" = "yes" && AC_DEFINE(KERBEROS) 3353 test "$with_kerberos" = "yes" && AC_DEFINE(KERBEROS)
3327 test "$with_hesiod" = "yes" && AC_DEFINE(HESIOD) 3354 test "$with_hesiod" = "yes" && AC_DEFINE(HESIOD)
3328 3355 test "$with_clash_detection" = "yes" && AC_DEFINE(CLASH_DETECTION)
3329 test "$use_union_type" != yes && AC_DEFINE(NO_UNION_TYPE) 3356 test "$use_union_type" != yes && AC_DEFINE(NO_UNION_TYPE)
3330 3357
3331 dnl ------------------------------- 3358 dnl -------------------------------
3332 dnl Report on what we decided to do 3359 dnl Report on what we decided to do
3333 dnl ------------------------------- 3360 dnl -------------------------------