xemacs-beta: configure.in comparison

comparison configure.in @ 414:da8ed4261e83 r21-2-15

Import from CVS: tag r21-2-15

author	cvs
date	Mon, 13 Aug 2007 11:21:38 +0200
parents	697ef44129c6
children	ebe98a74bd68

comparison

equal deleted inserted replaced

-:901169e5ca31
+:da8ed4261e83
 	with_xface	| \
 	with_gif	| \
 	with_jpeg	| \
 	with_png	| \
 	with_tiff	| \
-	with_session	| \
+	with_wmcommand	| \
 	with_xmu	| \
 	with_purify	| \
 	with_quantify	| \
 	with_toolbars	| \
 	with_tty	| \
 	      nogc )          error_check_gc=no ;;
 	      malloc )	      error_check_malloc=yes ;;
 	      nomalloc )      error_check_malloc=no ;;
+	      byte_code )     error_check_byte_code=yes ;;
+	      nobyte_code )   error_check_byte_code=no ;;
 	      * ) bogus_error_check=yes ;;
 	    esac
 	    if test "$bogus_error_check" -o \
 	         \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
 		if test "$error_check_default" = yes ; then
-		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', and \`nomalloc'."
+		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', and \`nobyte-code'."
 		else
-		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', and \`malloc'."
+		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', and \`byte-code'."
 		fi
 		USAGE_ERROR(["Valid types for the \`--$optname' option are:
 $types."])
 	    elif test -n "$new_default" ; then
 		error_check_extents=$new_default
 		error_check_typecheck=$new_default
 		error_check_bufpos=$new_default
 		error_check_gc=$new_default
 		error_check_malloc=$new_default
+		error_check_byte_code=$new_default
 		new_default=	# reset this
 	    fi
 	    echeck_notfirst=true
 	  done
 	;;
 dnl ----------------------------------------
 dnl Find out which version of XEmacs this is
 dnl ----------------------------------------
 . "$srcdir/version.sh" || exit 1;
 dnl Must do the following first to determine verbosity for AC_DEFINE
-if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi
+if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
 : "${extra_verbose=$beta}"
 version="${emacs_major_version}.${emacs_minor_version}"
 AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version)
 AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version)
-if test -n "$emacs_beta_version"; then
+if test -n "$emacs_beta_version" ; then
-version="${version}-b${emacs_beta_version}"
+if test "$beta" = "yes"; then
-AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
+	version="${version}-b${emacs_beta_version}"
+	AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
+else
+	version="${version}.${emacs_beta_version}"
+	AC_DEFINE_UNQUOTED(EMACS_PATCH_LEVEL, $emacs_beta_version)
+fi
 fi
 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
 if test "$with_infodock" = "yes"; then
 dnl ----------------------------------
 dnl Error checking and debugging flags
 dnl ----------------------------------
 dnl Error checking default to "yes" in beta versions, to "no" in releases.
 dnl Same goes for --debug and --extra-verbosity.
-if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi
+if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
 test "${error_check_extents=$beta}"   = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK)
 test "${error_check_bufpos=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_BUFPOS)
 test "${error_check_gc=$beta}"        = yes && AC_DEFINE(ERROR_CHECK_GC)
 test "${error_check_malloc=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
+test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
 dnl debug=yes must be set when error checking is present.  This should be
 dnl fixed up.
 dnl debug implies other options
 if test "${debug:=$beta}" = "yes"; then
 use_assertions=yes memory_usage_stats=yes
 dnl Site prefixes take precedence over the standard places, but not over
 dnl site-includes and site-libraries.
 COLON_TO_SPACE(site_prefixes)
 if test -n "$site_prefixes"; then
 for dir in $site_prefixes; do
-inc_dir="${dir}/include"
 lib_dir="${dir}/lib"
 if test ! -d "$dir"; then
 XE_DIE("Invalid site prefix \`$dir': no such directory")
-elif test ! -d "$inc_dir"; then
-XE_DIE("Invalid site prefix \`$dir': no such directory \`$inc_dir'")
 elif test ! -d "$lib_dir"; then
 XE_DIE("Invalid site prefix \`$dir': no such directory \`$lib_dir'")
 else
-XE_APPEND("-I$inc_dir", c_switch_site)
+if test -d "$inc_dir"; then
+	XE_APPEND("-I$inc_dir", c_switch_site)
+fi
 XE_APPEND("-L$lib_dir", ld_switch_site)
 fi
 done
 fi
 dnl It ought to be reasonable to have no output device at all, and only use
 dnl XEmacs in --batch mode.
 dnl if test "$with_tty" = "no" ; then
 dnl   AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
 dnl fi
-for feature in tooltalk cde offix session xim xmu
+for feature in tooltalk cde offix wmcommand xim xmu
 do
 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
 AC_MSG_WARN([--with-$feature ignored:  Not valid without X support])
 fi
 eval "with_${feature}=no"
 case "$x_libraries" in *X11R4* )
 test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
 esac
-dnl Enable or disable proper session-management
+dnl Enable or disable proper handling of WM_COMMAND
-AC_CHECKING(for session-management option);
+AC_CHECKING(for WM_COMMAND option);
-dnl if test "$with_session" = "yes"; then
+dnl if test "$with_wmcommand" = "yes"; then
-if test "$with_session" != "no"; then
+if test "$with_wmcommand" != "no"; then
-AC_DEFINE(HAVE_SESSION)
+AC_DEFINE(HAVE_WMCOMMAND)
 fi
 dnl Autodetect Xauth
 dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 fi
 echo ""
 echo "$0 $quoted_arguments"
 ) > Installation
-xemacs_betaname=""
+if test ! -z ${emacs_beta_version} ; then
-test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}"
+if test -z "${emacs_is_beta}" ; then
+	xemacs_betaname=".${emacs_beta_version}"
+else
+	xemacs_betaname="-b${emacs_beta_version}"
+fi
+else
+xemacs_betaname=""
+fi
 dnl Start stdout redirection to '| tee -a Installation'
 (
 echo "
 test "$with_cde"      = yes && echo "  Compiling in support for CDE."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_offix"    = yes && echo "  Compiling in support for OffiX."
 test "$with_dragndrop" = yes && echo "  Compiling in EXPERIMENTAL support for Drag'n'Drop ($dragndrop_proto )."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
-test "$with_session"  != no && echo "  Compiling in support for proper session-management."
+test "$with_wmcommand"  != no && echo "  Compiling in support for proper WM_COMMAND handling."
 case "$with_menubars" in
 lucid ) echo "  Using Lucid menubars." ;;
 motif ) echo "  Using Motif menubars."
 echo "  *WARNING*  The Motif menubar implementation is currently buggy."
 echo "             We recommend using the Lucid menubar instead."

Mercurial > hg > xemacs-beta

comparison configure.in @ 414:da8ed4261e83 r21-2-15