comparison configure.in @ 343:8bec6624d99b r21-1-1

Import from CVS: tag r21-1-1
author cvs
date Mon, 13 Aug 2007 10:52:53 +0200
parents 54f7aa390f4f
children 7c94d56991e1
comparison
equal deleted inserted replaced
342:b036ce23deaa 343:8bec6624d99b
923 dnl ---------------------------------------- 923 dnl ----------------------------------------
924 dnl Find out which version of XEmacs this is 924 dnl Find out which version of XEmacs this is
925 dnl ---------------------------------------- 925 dnl ----------------------------------------
926 . "$srcdir/version.sh" || exit 1; 926 . "$srcdir/version.sh" || exit 1;
927 dnl Must do the following first to determine verbosity for AC_DEFINE 927 dnl Must do the following first to determine verbosity for AC_DEFINE
928 if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi 928 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
929 : "${extra_verbose=$beta}" 929 : "${extra_verbose=$beta}"
930 version="${emacs_major_version}.${emacs_minor_version}" 930 version="${emacs_major_version}.${emacs_minor_version}"
931 AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) 931 AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version)
932 AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) 932 AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version)
933 if test -n "$emacs_beta_version"; then 933 if test -n "$emacs_beta_version" ; then
934 version="${version}-b${emacs_beta_version}" 934 if test "$beta" = "yes"; then
935 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) 935 version="${version}-b${emacs_beta_version}"
936 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
937 else
938 version="${version}-p${emacs_beta_version}"
939 AC_DEFINE_UNQUOTED(EMACS_PATCH_LEVEL, $emacs_beta_version)
940 fi
936 fi 941 fi
937 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") 942 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
938 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 943 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
939 944
940 if test "$with_infodock" = "yes"; then 945 if test "$with_infodock" = "yes"; then
960 dnl ---------------------------------- 965 dnl ----------------------------------
961 dnl Error checking and debugging flags 966 dnl Error checking and debugging flags
962 dnl ---------------------------------- 967 dnl ----------------------------------
963 dnl Error checking default to "yes" in beta versions, to "no" in releases. 968 dnl Error checking default to "yes" in beta versions, to "no" in releases.
964 dnl Same goes for --debug and --extra-verbosity. 969 dnl Same goes for --debug and --extra-verbosity.
965 if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi 970 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
966 test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) 971 test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
967 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK) 972 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK)
968 test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS) 973 test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS)
969 test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) 974 test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
970 test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) 975 test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
3932 fi 3937 fi
3933 echo "" 3938 echo ""
3934 echo "$0 $quoted_arguments" 3939 echo "$0 $quoted_arguments"
3935 ) > Installation 3940 ) > Installation
3936 3941
3937 xemacs_betaname="" 3942 if test ! -z ${emacs_beta_version} ; then
3938 test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}" 3943 if test -z "${emacs_is_beta}" ; then
3944 xemacs_betaname="-p${emacs_beta_version}"
3945 else
3946 xemacs_betaname="-b${emacs_beta_version}"
3947 fi
3948 else
3949 xemacs_betaname=""
3950 fi
3939 3951
3940 dnl Start stdout redirection to '| tee -a Installation' 3952 dnl Start stdout redirection to '| tee -a Installation'
3941 ( 3953 (
3942 echo " 3954 echo "
3943 3955