xemacs-beta: configure.in comparison

comparison configure.in @ 120:cca96a509cfe r20-1b12

Import from CVS: tag r20-1b12

author	cvs
date	Mon, 13 Aug 2007 09:25:29 +0200
parents	7d55a9ba150c
children	1370575f1259

comparison

equal deleted inserted replaced

-:d101af7320b8
+:cca96a509cfe
-dnl -*- mode: m4; m4-mode-hook : (lambda () (modify-syntax-entry ?\" "\"\"")) ;  -*-
+dnl -*- mode: m4; -*-
 dnl Synched up with: FSF 19.31.
 dnl (19.29 -- 19.31 use Autoconf 2.x instead of Autoconf 1.x.
 dnl  Some stuff related to this change has not been synched because
 dnl  it can't be until we switch to Autoconf 2.x.)
 dnl
 dnl
 dnl The following text appears in the resulting `configure' script,
 dnl explaining how to rebuild it.
 dnl
 AC_PREREQ(1.9)dnl means 'delete newline' and this one needs to be here
-[#!/bin/sh
+#!/bin/sh
 #### Configuration script for XEmacs.
 #### Copyright (C) 1994 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1995, 1996 Ben Wing.
 #									   #
 #                             Usage messages                               #
 #									   #
 ############################################################################
-short_usage="Usage: ${progname} CONFIGURATION [-OPTION[=VALUE] ...]
+short_usage="Usage: ${progname} CONFIGURATION [[-OPTION[=VALUE] ...]]
 Set compilation and installation parameters for XEmacs, and report.
 CONFIGURATION specifies the machine and operating system to build for.
 Note that for most of the following options, you can explicitly enable
 --with-x (*)		Support the X Window System.
 --with-x=no		Don't support X.
 --x-includes=DIR 	Search for X header files in DIR.
 --x-libraries=DIR	Search for X libraries in DIR.
---with-ns		Support NeXTstep windows (not yet implemented).
 --with-menubars=TYPE	Use TYPE menubars (lucid, motif, or no).  The Lucid
 			widgets emulate Motif (mostly) but are faster.
 			*WARNING*  The Motif menubar is currently broken.
 --with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena,
 			athena3d, or no).
 --with-sound=nas	Compile with network sound support.
 --with-sound=both	Compile with native and network sound support.
 --native-sound-lib=LIB	Native sound support library.  Needed on Suns
 			with --with-sound=both because both sound libraries
 			are called libaudio.
---with-epoch		Compile with additional Epoch compatibility.
 --with-mocklisp		Compile with Mocklisp support.  Don't do this
 			unless you have a Mocklisp program that you need
 			to run.
 --usage-tracking	Enable some Sun-internal code.  If you don't
 			know what this is, you don't want it.
 Debugging options:
 --debug			Compile with support for debugging XEmacs.
 			(Causes code-size increase and little loss of speed.)
---error-checking=TYPE[,TYPE]...
+--error-checking=TYPE[[,TYPE]]...
 			Compile with internal error-checking added.
 			Causes noticeable loss of speed.  Valid types
 			are extents, bufpos, malloc, gc, typecheck.
 --error-checking=none	Disable all internal error-checking (the default).
 --error-checking=all	Enable all internal error-checking.
 #									   #
 #                           Options processing                             #
 #									   #
 ############################################################################
+define([USAGE_ERROR],
+[(echo "${progname}: Usage error:"
+echo " " $1
+echo "  Use \`${progname} --help' for more details.") >&2 && exit 1])
 ### Record all the arguments, so we can save them in config.status.
 arguments="$@"
 ### Shell Magic: Quote the quoted arguments in ARGUMENTS.  At a later date,
 ### in order to get the arguments back in $@, we have to do an
 ###  `eval set x "$quoted_arguments"; shift'.
+### We use sed to turn embedded ' into '"'"'.  I truly hate sh's quoting.
+quoted_sed_magic=s/"'"/"'"'"'"'"'"'"'"/g
 quoted_arguments=
 for i in "$@"; do
-quoted_arguments="$quoted_arguments '$i'"
+case "$i" in
+-no-create | --no-create | --no-creat | --no-crea | --no-cre \
+| --no-cr | --no-c) ;;
+-norecursion | --norecursion | --norecursio | --norecursi \
+| --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;;
+*)
+quoted_i="`echo $i | sed $quoted_sed_magic`"
+quoted_arguments="$quoted_arguments '$quoted_i'" ;;
+esac
 done
 ### Don't use shift -- that destroys the argument list, which autoconf needs
 ### to produce config.status.  It turns out that "set - ${arguments}" doesn't
 ### work portably.
 ## Anything starting with a hyphen we assume is an option.
 -* )
 ## Separate the switch name from the value it's being given.
 case "${arg}" in
 -*=*)
-	  opt=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*\([^=]*\)=.*$:\1:'`
+	  opt=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*\([[^=]]*\)=.*$:\1:'`
-	  val=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*[^=]*=\(.*\)$:\1:'`
+	  val=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*[[^=]]*=\(.*\)$:\1:'`
 	  valomitted=no
 	;;
 #         ## special case these strings since echo may
 #         ## silently eat them.
 #         --help ) opt=help val=yes valomitted=yes ;;
 	with_x		| \
 	with_x11	| \
 	with_gcc	| \
 	with_lcc	| \
 	with_gnu_make	| \
-	with_epoch	| \
 	dynamic		| \
 	with_term	| \
 	with_cde	| \
 	with_offix	| \
 	with_xpm	| \
 	with_tiff	| \
 	with_socks	| \
 	with_xface	| \
 	with_xmu	| \
 	quantify	| \
-	with_ns		| \
 	with_toolbars	| \
 	with_tty	| \
 	with_i18n3	| \
 	with_mule	| \
 	with_canna	| \
 	with_tooltalk   | \
 	with_pop	| \
 	with_kerberos	| \
 	with_hesiod	| \
 	external_widget | \
-	extra_verbose   | \
+	verbose		| \
+	extra_verbose	| \
 	const_is_losing | \
 	usage_tracking  | \
 	use_union_type  | \
 	debug		| \
 	use_assertions	| \
 	no_doc_file )
 	  ## Make sure the value given was either "yes" or "no".
 	  case "${val}" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no  ;;
-	    * )
+	    * ) USAGE_ERROR("The \`--${optname}' option requires a boolean value: \`yes' or \`no'.") ;;
-	      (echo "${progname}: the \`--${optname}' option is supposed to have a boolean value.
-Set it to either \`yes' or \`no'."
-	       echo "${short_usage}") >&2
-	      exit 1 ;;
 	  esac
 eval "${opt}=\"${val}\"" ;;
 	## Options that take a user-supplied value, as in --puresize=8000000
 	srcdir		| \
 	compiler	| \
 	puresize	| \
-	native_sound_lib	| \
+	native_sound_lib | \
 	x_includes	| \
 	x_libraries	| \
 wnn_includes    | \
 wnn_libraries   | \
-canna_includes    | \
+canna_includes  | \
-canna_libraries   | \
+canna_libraries | \
 	site_includes	| \
 	site_libraries	| \
 	site_runtime_libraries  )
 	  ## If the value was omitted, get it from the next argument.
 	  if test "${valomitted}" = "yes" ; then
 	    ## Get the next argument from the argument list, if there is one.
-if test $# = 0 ; then
+if test "$#" = 0 ; then
-	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
+	      USAGE_ERROR("The \`--${optname}' option requires a value.");
-\`--${optname}=FOO'."
-	       echo "${short_usage}") >&2
-	      exit 1
 	    fi
 	    val="$1"; shift
 	  fi
 eval "${opt}=\"${val}\""
 	;;
 	  case "${val}" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no  ;;
 	    d | de | def | defa | defau | defaul | default )
 				val=default ;;
-	    * )
+	    * ) USAGE_ERROR(["The \`--${optname}' option requires one of these values:
-	      (echo "${progname}: the \`--${optname}' option is supposed to have a boolean value or \`default'.
+\`yes', \`no', or \`default'."]) ;;
-Set it to either \`yes', \`no', or \`default'."
-	       echo "${short_usage}") >&2
-	      exit 1
-	    ;;
 	  esac
 eval "${opt}=\"${val}\""
 ;;
 ## Has the user requested database support?
 "with_database" )
-	  if test "${val}" = "no"  ; then
+	  with_database_berkdb=no
-	    with_database_berkdb=no
+	  with_database_dbm=no
-	    with_database_dbm=no
+	  with_database_gnudbm=no
-	    with_database_gnudbm=no
+## Make sure the value given was `no' or a list of berkdb, dbm, gnudbm
-	  else
+	  for x in `echo "${val}" | sed 's/,/ /'` ; do
-## Make sure the value given was berkdb, dbm, gnudbm, or a list
+	    case "${x}" in
-	    for x in `echo "${val}" | sed 's/,/ /'` ; do
+		no ) : ;;
-	      case "${x}" in
+		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
-b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
+		d | db | dbm )				with_database_dbm=yes    ;;
-d | db | dbm )				with_database_dbm=yes ;;
 		g | gn | gnu | gnud | gnudb | gnudbm )  with_database_gnudbm=yes ;;
-		* )
+		* ) USAGE_ERROR(["The \`--${optname}' option value
-(echo "${progname}: the \`--${optname}' option is supposed to be either \`no'
+must be either \`no' or a comma-separated list
-or a comma-separated list of one or more of \`berkdb', \`dbm', or \`gnudbm'."
+of one or more of \`berkdb', \`dbm', or \`gnudbm'."]) ;;
-echo "${short_usage}") >&2
+esac
-exit 1
+	  done
-;;
+	  if test "${with_database_dbm}"    = "yes" -a \
-esac
+	          "${with_database_gnudbm}" = "yes" ; then
-	    done
+	  USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified
-	    if test "${with_database_dbm}" = "yes" -a "${with_database_gnudbm}" = "yes"
+with the \`--${optname}' option.")
-	    then
-	      (echo "${progname}: only one of \`dbm' and \`gnudbm' should be specified.") >&2
-	      exit 1
-	    fi
 	  fi
 ;;
 ## Has the user requested sound support?
 	"with_sound" )
 	    y | ye | yes )			val=native ;;
 	    n | no | non | none )		val=no;;
 	    na | nat | nati | nativ | native )	val=native  ;;
 	    ne | net | neta | netau | netaud | netaudi | netaudio | nas )	val=nas  ;;
 	    b | bo | bot | both )		val=both;;
-	    * )
+	    * ) USAGE_ERROR(["The \`--${optname}' option must have one of these values:
-	      (echo "${progname}: the \`--${optname}' option should have one of the values:"
+\`native', \`nas', \`both', or \`none'."]) ;;
-		echo "\`native', \`nas', \`both', or \`none'."
-		echo ""
-		echo "${short_usage}") >&2
-	      exit 1
-	    ;;
 	  esac
 eval "${opt}=\"${val}\""
 ;;
 ## Has the user requested XIM support?
 	"with_xim" )
 	  ## value can be xlib or motif
-	  ## as a backwards compatible synonym for native
 	  case "${val}" in
 	    y | ye | yes )			val=yes   ;;
 	    n | no | non | none )		val=no    ;;
 	    x | xl | xli | xlib )		val=xlib  ;;
 	    m | mo | mot | moti | motif )	val=motif ;;
-	    * )
+	    * ) USAGE_ERROR(["The \`--${optname}' option must have one of these values:
-	      (echo "${progname}: the \`--${optname}' option should have one of the values:"
+\`motif', \`xlib', \`yes', or \`no'."]) ;;
-		echo "\`motif', \`xlib', \`yes', or \`no'."
-		echo ""
-		echo "${short_usage}") >&2
-	      exit 1
-	    ;;
 	  esac
 eval "${opt}=\"${val}\""
 ;;
 ## Has the user requested PNG support?
 	  ## Make sure the value given was either "yes", "no", or "gnuz".
 	  case "${val}" in
 	    y | ye | yes )	  val=yes  ;;
 	    n | no )		  val=no   ;;
 	    g | gn | gnu | gnuz ) val=gnuz ;;
-	    * )
+	    * ) USAGE_ERROR(["The \`--${optname}' option must have one of these values:
-	      (echo "${progname}: the \`--${optname}' option is supposed to
+\`yes', \`no', or \`gnuz'."]) ;;
-be either \`yes', \`no', or \`gnuz'."
-	       echo "${short_usage}") >&2
-	      exit 1
-	    ;;
 	  esac
 eval "${opt}=\"${val}\""
 ;;
 ## Has the user requested error-checking?
 	      * ) bogus_error_check=yes ;;
 	    esac
 	    if test "$bogus_error_check" -o \
 	         \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
-		( echo "${progname}: Valid types for the \`--${optname}' option are:"
 		if test $error_check_default = yes ; then
-		  echo "\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', and \`nomalloc'."
+		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', and \`nomalloc'."
 		else
-		  echo "\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', and \`malloc'."
+		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', and \`malloc'."
 		fi
-		echo "${short_usage}" ) >&2
+		USAGE_ERROR(["Valid types for the \`--${optname}' option are:
-		exit 1
+$types."])
 	    elif test "$new_default" ; then
 		error_check_extents=$new_default
 		error_check_typecheck=$new_default
 		error_check_bufpos=$new_default
 		error_check_gc=$new_default
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \
 	sitelispdir | docdir )
 	   ## If the value was omitted, get it from the next argument.
 	   if test "${valomitted}" = "yes" ; then
-	      if test $# = 0 ; then
+	     if test "$#" = 0 ; then
-		 (echo \
+		 USAGE_ERROR("The \`--${optname}' option requires a value.");
-"$progname: You must give a value for the \`--${optname}' option,";
+	     fi
-		  echo \
+	     val="$1"; shift
-"as in \`--${optname}=`eval echo '$'$optname`.'"
-		  echo "$short_usage") >&2
-		 exit 1
-	      fi
-	      val="$1"; shift
 	   fi
 	   eval "${opt}=\"${val}\""
 ## Changing exec_prefix or libdir will change the default value
 ## of archlibdir.  Changing datadir will change the default value
 	## Has the user specified values to override CFLAGS?
 	cflags )
 	   ## If the value was omitted, get it from the next argument.
 	   if test "${valomitted}" = "yes" ; then
-	      if test $# = 0 ; then
+	      if test "$#" = 0 ; then
-		 (echo \
+	        USAGE_ERROR("The \`--${optname}' option requires a value.");
-"$progname: You must give a value for the \`--${optname}' option,";
-		  echo \
-"as in \`--${optname}=`eval echo '$'$optname`-g -O'"
-		  echo "$short_usage") >&2
-		 exit 1
 	      fi
 	      val="$1"; shift
 	   fi
 	   eval "${opt}=\"${val}\""
 	   eval "${opt}_specified=1"
 	;;
-	## Verbose flag, tested by autoconf macros.
-	"verbose" )
-	  verbose=yes
-	;;
 	## --no-create added by autoconf for use by config.status
 	"no_create" )
 	;;
 	## Has the user asked for some help?
 	"usage" | "help" )
-	  if test -z "$PAGER"
+	  echo "${short_usage}" | ${PAGER:-more}
-	  then echo "${short_usage}" | more
+	  exit 0
-	  else echo "${short_usage}" | $PAGER
-	  fi
-	  exit
 	;;
 	## Has the user specified what toolkit to use for the menubars,
 	## scrollbar or dialogs?
 	"with_menubars" | "with_scrollbars" | "with_dialogs" )
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
 	    athena3d | athena-3d )			val=athena3d ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no ;;
-	    * )
+	    * ) USAGE_ERROR(["The \`--${optname}' option must have one of these values:
-	      (echo "${progname}: the \`--${optname}' option should have one of the values:"
+\`lucid', \`motif', \`athena', or \`no'."]) ;;
-		echo "\`lucid', \`motif', \`athena', or \`no'."
-		echo ""
-		echo "${short_usage}") >&2
-	      exit 1
-	    ;;
 	  esac
 	  eval "${opt}=\"${val}\""
 	;;
 ## Fail on unrecognized arguments.
-	* )
+	* ) USAGE_ERROR("Unrecognized option: ${arg}") ;;
-	  (echo "${progname}: Error: unrecognized option: ${arg}"
-	   echo ""
-echo "${short_usage}") >& 2
-	  exit 1
-	;;
 esac
 ;;
 ## Anything not starting with a hyphen we assume is a
 ### with_x is a synonym for with_x11
 test -n "${with_x}" && with_x11="${with_x}"
 ### Can't specify 2 compilers
 if test "${with_gcc}" = "yes" -a "${with_lcc}" = "yes"; then
-(echo "${progname}: only one of --with-gcc and --with-lcc may be specified."
+USAGE_ERROR("Only one of --with-gcc and --with-lcc may be specified.")
-echo "${short_usage}") >&2
-exit 1
 fi
 ### Ignore useless run-in-place flag
 if test "${run_in_place}" = "yes"; then
-] AC_WARN(The --run-in-place option is ignored because it is unnecessary.) [
+AC_WARN(The --run-in-place option is ignored because it is unnecessary.)
 fi
 ###########################################################################
 if test "${configuration}" = "" ; then
 echo '- You did not tell me what kind of host system you want to configure.
 - I will attempt to guess the kind of system this is.' 1>&2
 guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
 if configuration=`${CONFIG_SHELL-/bin/sh} ${guesssys}` ; then
 echo "- Looks like this is a ${configuration}" 1>&2
 else
-echo '- Failed to guess the system type.  You need to tell me.' 1>&2
+USAGE_ERROR("Failed to guess the system type.  You need to tell me.")
-echo "${short_usage}" >&2
-exit 1
 fi
 fi
 ### Find the source directory.
 case "${srcdir}" in
 ## If it's not specified, see if  `.' or `..' might work.
 "" )
-for dir in "`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`" "." ".." ; do
+for dir in "`echo $0 | sed 's|//|/|' | sed 's|/[[^/]]*$||'`" "." ".." ; do
-if test -f "$dir/src/lisp.h" -a -f "$dir/lisp/version.el" ; then
+if test -f "$dir/src/lisp.h" -a \
+	      -f "$dir/lisp/version.el" ; then
 srcdir="${dir}"
 break
 fi
 done
 if test -z "${srcdir}" ; then
-echo "\
+USAGE_ERROR(["Neither the current directory nor its parent seem to
-${progname}: Neither the current directory nor its parent seem to
+contain the XEmacs sources.  If you do not want to build XEmacs in its
-contain the XEmacs sources.  If you do not want to build XEmacs in its
+source tree, you should run \`${progname}' in the directory in which
-source tree, you should run \`${progname}' in the directory in which
+you wish to build XEmacs, using the \`--srcdir' option to say where the
-you wish to build XEmacs, using its \`--srcdir' option to say where the
+sources may be found."])
-sources may be found.
+fi
-${short_usage}" >&2
-	exit 1
-fi
 ;;
 ## Otherwise, check if the directory they specified is okay.
 * )
-if test ! -d "${srcdir}" -o ! -f "${srcdir}/src/lisp.h" -o ! -f "${srcdir}/lisp/version.el" ; then
+if test ! -d "${srcdir}" -o \
-(echo "\
+	    ! -f "${srcdir}/src/lisp.h" -o \
-${progname}: The directory specified with the \`--srcdir' option,
+	    ! -f "${srcdir}/lisp/version.el" ; then
-\`${srcdir}', doesn't seem to contain the XEmacs sources.  You should
+USAGE_ERROR(["The directory specified with the \`--srcdir' option,
-either run the \`${progname}' script at the top of the XEmacs source
+\`${srcdir}', doesn't seem to contain the XEmacs sources.  You should
-tree, or use the \`--srcdir' option to specify where the XEmacs sources
+either run the \`${progname}' script at the top of the XEmacs source
-are."
+tree, or use the \`--srcdir' option to specify the XEmacs source directory."])
-echo "${short_usage}") >&2
-exit 1
 fi
 ;;
 esac
 ## We check for this now instead of later when we check for other
 ## programs because we need to use its return value now.
-] AC_LN_S
+AC_LN_S
 AC_VERBOSE("setting LN_S to ${LN_S}")
 #### Make symlinks for etc, lisp, and info directories while the path
 #### is still relative.  We don't symlink lock because someone may
 echo Making symbolic link to ${srcdir}/$dir
 ${LN_S} ${srcdir}/$dir .
 fi
 done
-[
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessary, since pwd can
 #### give you automounter prefixes, which can go away.
 case "${srcdir}" in
 /* ) ;;
 echo "   as a build directory right now; it has been configured in its own"
 echo "   right.  To configure in another directory as well, you MUST"
 echo "   use GNU make.  If you do not have GNU make, then you must"
 echo "   now do \`make distclean' in ${srcdir},"
 echo "   and then run ${progname} again.") >&2
-extrasub='/^VPATH[	 ]*=/c\
+extrasub='/^VPATH[[	 ]]*=/c\
 vpath %.c $(srcdir)\
 vpath %.h $(srcdir)\
 vpath %.y $(srcdir)\
 vpath %.l $(srcdir)\
 vpath %.s $(srcdir)\
 ## NetBSD ports
 *-*-netbsd* )
 opsys=netbsd
 case "${canonical}" in
 sparc-*-netbsd*)    machine=sparc ;;
-i[3-9]86-*-netbsd*) machine=intel386 ;;
+i[[3-9]]86-*-netbsd*) machine=intel386 ;;
 hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
 # Yes, this is somewhat bogus.
 machine=hp9000s300 ;;
 pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
 pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
 fx80-alliant-* ) machine=alliant4     opsys=bsd4-2 ;;
 i860-alliant-* ) machine=alliant-2800 opsys=bsd4-3 ;;
 ## Alpha (DEC) machines.
 ## XEmacs change: split apart into numerous files.
-alpha-dec-osf1.3 | alpha-dec-osf2* ) machine=alpha opsys=decosf1-3 ;;
+alpha-*-* )
-alpha-dec-osf1.2 | alpha-dec-osf1* ) machine=alpha opsys=decosf1-2 ;;
+machine=alpha
+case "${canonical}" in
-## XEmacs: Add switch for OSF 1 version 3 (roth@cse.ucsc.edu)
+*-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;;
-## XEmacs: Add switch for Digital Unix version 4 (srivasta@pilgrim.umass.edu)
+*-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;;
-alpha-dec-osf3.[2-9] ) machine=alpha opsys=decosf3-2 ;;
-alpha-dec-osf3* )      machine=alpha opsys=decosf3-1 ;;
+## XEmacs: Add switch for OSF 1 version 3 (roth@cse.ucsc.edu)
-alpha-dec-osf4* )      machine=alpha opsys=decosf4-0 ;;
+## XEmacs: Add switch for Digital Unix version 4 (srivasta@pilgrim.umass.edu)
-alpha-*-linux* )       machine=alpha opsys=linux ;;
+*-dec-osf3.[[2-9]] ) opsys=decosf3-2 ;;
+*-dec-osf3* )        opsys=decosf3-1 ;;
+*-dec-osf4* )        opsys=decosf4-0 ;;
+*-*-linux*  )        opsys=linux ;;
+esac
+;;
 ## Altos 3068
 m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;;
 ## Amdahl UTS
 ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov
 NON_GNU_CPP="cc -E -P"
 ;;
 ## Cubix QBx/386
-i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
+i[[3-9]]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
 ## Cydra 5
 cydra*-cydrome-sysv* ) machine=cydra5 opsys=usg5-3 ;;
 ## Data General AViiON Machines
-i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
+i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
 m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) machine=aviion opsys=dgux5-4r3 ;;
 m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) machine=aviion opsys=dgux5-4r2 ;;
 m88k-dg-dgux* 			  ) machine=aviion opsys=dgux	   ;;
-mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0* | mips-dec-bsd4.2* ) machine=pmax opsys=bsd4-2 ;;
+## Dec Mips machines
-mips-dec-ultrix4.[12]* | mips-dec-bsd* ) machine=pmax opsys=bsd4-3 ;;
+mips-dec-* )
-mips-dec-ultrix* )                       machine=pmax opsys=ultrix4-3 ;;
+machine=pmax
-mips-dec-osf* )                          machine=pmax opsys=osf1 ;;
+case "${canonical}" in
-mips-dec-mach_bsd4.3* )                  machine=pmax opsys=mach-bsd4-3 ;;
+*-*-ultrix[[0-3]].* | *-*-ultrix4.0* | *-*-bsd4.2* ) opsys=bsd4-2 ;;
+*-*-ultrix4.[[12]]* | *-*-bsd* ) opsys=bsd4-3 ;;
+*-*-ultrix* )                    opsys=ultrix4-3 ;;
+*-*-osf* )                       opsys=osf1 ;;
+*-*-mach_bsd4.3* )               opsys=mach-bsd4-3 ;;
+esac
+;;
 ## Motorola Delta machines
 m68k-motorola-sysv* | m68000-motorola-sysv* )
 machine=delta opsys=usg5-3
 if test -z "`type gnucc | grep 'not found'`"
 ## Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000
 ## as far as XEmacs is concerned).
 m88k-harris-cxux* )
 # Build needs to be different on 7.0 and later releases
 case "`uname -r`" in
-[56].[0-9] ) machine=nh4000 opsys=cxux  ;;
+[[56]].[[0-9]] ) machine=nh4000 opsys=cxux  ;;
-[7].[0-9]  ) machine=nh4000 opsys=cxux7 ;;
+[[7]].[[0-9]]  ) machine=nh4000 opsys=cxux7 ;;
 esac
 NON_GNU_CPP="/lib/cpp"
 ;;
 ## Harris ecx or gcx running CX/UX (Series 1200, Series 3000)
 m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;;
 ## Orion machines
 orion-orion-bsd*   ) machine=orion    opsys=bsd4-2 ;;
 clipper-orion-bsd* ) machine=orion105 opsys=bsd4-2 ;;
 ## IBM machines
-i[3-9]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
+i[[3-9]]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
-i[3-9]86-ibm-aix1.[23]* | i[3-9]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;;
+i[[3-9]]86-ibm-aix1.[[23]]* | i[[3-9]]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;;
 i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;;
 rs6000-ibm-aix3.1*  | powerpc-ibm-aix3.1*  ) machine=ibmrs6000 opsys=aix3-1	;;
 rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 ) machine=ibmrs6000 opsys=aix3-2-5	;;
 rs6000-ibm-aix4.2*  | powerpc-ibm-aix4.2*  ) machine=ibmrs6000 opsys=aix4-2	;;
 rs6000-ibm-aix4.1*  | powerpc-ibm-aix4.1*  ) machine=ibmrs6000 opsys=aix4-1	;;
 ## Integrated Solutions `Optimum V'
 m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;;
 m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;;
 ## Intel 386 machines where we do care about the manufacturer
-i[3-9]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
+i[[3-9]]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
 ## Prime EXL
-i[3-9]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
+i[[3-9]]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
 ## Sequent Symmetry running Dynix
-i[3-9]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
+i[[3-9]]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
 ## Sequent Symmetry running DYNIX/ptx
 ## Use the old cpp rather than the newer ANSI one.
-i[3-9]86-sequent-ptx* )
+i[[3-9]]86-sequent-ptx* )
 machine=sequent-ptx opsys=ptx
 NON_GNU_CPP="/lib/cpp"
 ;;
 ## Unspecified sysv on an ncr machine defaults to svr4.2.
 ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
-i[3-9]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
+i[[3-9]]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
 ## Intel Paragon OSF/1
 i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;;
 ## Intel 860
 m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;;
 m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;;
 ## Iris 4D
 mips-sgi-irix3.*      ) machine=iris4d opsys=irix3-3 ;;
 mips-sgi-irix4.*      ) machine=iris4d opsys=irix4-0 ;;
-mips-sgi-irix6*       ) machine=iris4d
+mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0 NON_GNU_CC="cc -Olimit 2000" ;;
-			opsys=irix6-0
+mips-sgi-irix5.[[3-9]]* ) machine=iris4d opsys=irix5-3 ;;
-			NON_GNU_CC="cc -Olimit 2000" ;;
-mips-sgi-irix5.[3-9]* ) machine=iris4d opsys=irix5-3 ;;
 mips-sgi-irix5.2*     ) machine=iris4d opsys=irix5-2 ;;
 mips-sgi-irix5.1*     ) machine=iris4d opsys=irix5-1 ;;
 mips-sgi-irix*        ) machine=iris4d opsys=irix5-0 ;;
 ## SONY machines
 # Hardware type
 case "${canonical}" in
 m68*-sunos1* )	         machine=sun1     ;;
 m68*-sunos2* )	         machine=sun2     ;;
 m68* )		         machine=sun3     ;;
-i[3-9]86*-sun-sunos[34]* ) machine=sun386   ;;
+i[[3-9]]86*-sun-sunos[[34]]* ) machine=sun386 ;;
-i[3-9]86-*-* )	         machine=intel386 ;;
+i[[3-9]]86-*-* )	         machine=intel386 ;;
 rs6000* )                  machine=rs6000   ;;
 sparc* )		         machine=sparc    ;;
 powerpc* )	         machine=powerpc  ;;
 * )		         unported=yes     ;;
 esac
 test -f /usr/lib/cpp     && NON_GNU_CPP=/usr/lib/cpp ;;
 *-solaris2* )
 test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
 RANLIB=':'
 	case "${canonical}" in
-	  *-solaris2.[6-9]* ) need_dynodump=no  ;;
+	  *-solaris2.[[6-9]]* ) need_dynodump=no  ;;
 	  *-solaris2*       ) need_dynodump=yes ;;
 	esac
 esac
 case "${canonical}" in
 ## The Sun386 didn't get past 4.0.
-i[3-9]86-*-sunos4*  ) opsys=sunos4-0	;;
+i[[3-9]]86-*-sunos4*  ) opsys=sunos4-0	;;
 *-sunos4.0*	  ) opsys=sunos4-0	;;
 *-sunos4.1.2*	  ) opsys=sunos4-1-2	;;
 *-sunos4.1.3*	  ) opsys=sunos4-1-3	;;
-*-sunos4.1.[4-9]*	  ) opsys=sunos4-1-4	;;
+*-sunos4.1.[[4-9]]* ) opsys=sunos4-1-4	;;
 *-sunos4* | *-sunos ) opsys=sunos4-1	;;
 *-solaris2.3*	  ) opsys=sol2-3	;;
 *-solaris2.4*	  ) opsys=sol2-4	;;
 *-solaris2.5*	  ) opsys=sol2-5	;;
-*-solaris2.[6-9]*	  ) opsys=sol2-6	;;
+*-solaris2.[[6-9]]* ) opsys=sol2-6	;;
 *-solaris*	  ) opsys=sol2		;;
 *-mach*		  ) opsys=mach-bsd4-3	;;
 *			  ) opsys=bsd4-2	;;
 esac
 ## Vaxen.
 vax-dec-* )
 machine=vax
 case "${canonical}" in
 *-bsd4.1* ) 					opsys=bsd4-1 ;;
-*-bsd4.2* | *-ultrix[0-3].* | *-ultrix4.0* )	opsys=bsd4-2 ;;
+*-bsd4.2* | *-ultrix[[0-3]].* | *-ultrix4.0* )	opsys=bsd4-2 ;;
 *-bsd4.3* | *-ultrix* ) 				opsys=bsd4-3 ;;
-*-sysv[01]* | *-sysvr[01]* ) 			opsys=usg5-0 ;;
+*-sysv[[01]]* | *-sysvr[[01]]* ) 			opsys=usg5-0 ;;
 *-sysv2* | *-sysvr2* )				opsys=usg5-2 ;;
 *-vms* ) 						opsys=vms ;;
 *-mach* )						opsys=mach-bsd4-3 ;;
 * ) 						unported=yes
 esac
 ## Wicat
 m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;;
 ## Intel 386 machines where we don't care about the manufacturer
-i[3-9]86-*-* )
+i[[3-9]]86-*-* )
 machine=intel386
 case "${canonical}" in
-*-isc1.* | *-isc2.[01]* )	opsys=386-ix ;;
+*-isc1.* | *-isc2.[[01]]* ) opsys=386-ix ;;
 *-isc2.2* )		opsys=isc2-2 ;;
 *-isc4.0* )		opsys=isc4-0 ;;
 *-isc4.* )		opsys=isc4-1
 				GCC_TEST_OPTIONS=-posix
 				NON_GCC_TEST_OPTIONS=-Xp
 ### runs, it's cleaner to make it explicit in the case statement
 ### above.
 if test -z "${opsys}" ; then
 case "${canonical}" in
 *-gnu* )			opsys=gnu    ;;
-*-bsd4.[01] )		opsys=bsd4-1 ;;
+*-bsd4.[[01]] )		opsys=bsd4-1 ;;
 *-bsd4.2 )			opsys=bsd4-2 ;;
 *-bsd4.3 )			opsys=bsd4-3 ;;
 *-sysv0    | *-sysvr0 )	opsys=usg5-0 ;;
 *-sysv2    | *-sysvr2 )	opsys=usg5-2 ;;
 *-sysv2.2  | *-sysvr2.2 )	opsys=usg5-2-2 ;;
 *-sysv3*   | *-sysvr3* )	opsys=usg5-3 ;;
 *-sysv4.1* | *-sysvr4.1* )	opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
-*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
+*-sysv4.[[2-9]]* | *-sysvr4.[[2-9]]* )
 	if test -z "$NON_GNU_CPP" ; then
 	  if test -f /usr/ccs/lib/cpp
 	  then NON_GNU_CPP=/usr/ccs/lib/cpp
 	  else NON_GNU_CPP=/lib/cpp
 	  fi
 dynodump_arch=''
 if test "${need_dynodump}" = "yes" ; then
 case "${canonical}" in
 sparc*    ) dynodump_arch=sparc ;;
 powerpc*  ) dynodump_arch=ppc   ;;
-i[3-9]86* ) dynodump_arch=i386  ;;
+i[[3-9]]86* ) dynodump_arch=i386  ;;
 esac
 fi
 machfile="m/${machine}.h"
 opsysfile="s/${opsys}.h"
 #									   #
 #            Determine the compiler, set up for feature testing            #
 #									   #
 ############################################################################
-]
 dnl -----------------------------------------------------------------------
 dnl Let's do a couple of macro (re)definitions.
 dnl
 dnl First we redefine AC_TEST_CPP so that we can see the error output
 dnl from preprocessor runs.  This definition is identical to the standard
 fi
 ;;
 esac
 fi
-[
 #### Some systems specify a CPP to use unless we are using GCC.
 #### Now that we know whether we are using GCC, we can decide whether
 #### to use that one.
 if test "x$NON_GNU_CPP" = x -o x$GCC = x1
 then true
 ############################################################################
 #### Some other nice autoconf tests.  If you add a test here which
 #### should make an entry in src/config.h, don't forget to add an
 #### #undef clause to src/config.h.in for autoconf to modify.
-]
 dnl checks for programs
 AC_PROG_CPP
-[
 case "${canonical}" in
 *-sun-sunos* )
 if test "${CPP}" = "acc -E"  ; then
 CPP="acc -E -Xs"
 fi
 ;;
 esac
-]
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_YACC
 dnl checks for UNIX variants
 AC_AIX
 dnl checks for header files
-AC_HAVE_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h utime.h sys/wait.h libintl.h locale.h libgen.h linux/version.h kstat.h sys/pstat.h)
+AC_HAVE_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h)
+AC_HAVE_HEADERS(utime.h sys/wait.h libintl.h locale.h libgen.h)
+AC_HAVE_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h)
 AC_STDC_HEADERS
 AC_TIME_WITH_SYS_TIME
 AC_SYS_SIGLIST_DECLARED
 dnl Some systems have utime.h but don't declare the struct anyplace.
 need_xildoff=yes
 fi
 fi
 dnl other checks for UNIX variants
-[
 # What the hell was this doing here??????
 ### echo > confdefs.h		# this gets nuked above...
 ############################################################################
 #									   #
 echo "Don't specify a window system more than once." >&2
 exit 1
 ;;
 esac
-]
 case "${window_system}" in "" | "x11" )
 ### If the user hasn't specified where we should find X, try
 ### letting autoconf figure that out.
 if test -z "${x_includes}${x_libraries}" ; then
 AC_FIND_X
 if test "${with_tty}" != "yes" ; then
 echo "No window system support, and no TTY support." >&2
 echo "Unable to proceed." >&2
 exit 1
 fi
-for feature in epoch cde offix menubars scrollbars toolbars dialogs xim tiff
+for feature in cde offix menubars scrollbars toolbars dialogs xim tiff
 do
 if eval "test -n \"\$with_$feature\" -a \"\$with_$feature\" != no" ; then
 AC_WARN(--with-$feature ignored:  Not valid without X support)
 fi
 eval "with_$feature=no"
 done
 elif test -z "${with_toolbars}"  ; then
 with_toolbars='yes'
 fi
-[
 runtime_arg="-R${dash_r_space}"
 case "${canonical}" in
 *-sun-solaris* | *-sun-sunos5* )
 add_runtime_flag=yes ;;
 # The value of CPP is a quoted variable reference, so we need to do this
 # to get its actual value...
 CPP=`eval "echo $CPP"`
 eval `${CPP} -Isrc ${tempcname} \
 | grep 'configure___' \
-| sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
+| sed -n -e 's/^configure___ \([[^=]]*=\)\(.*\)$/\1"\2"/p'`
 if test "x$SPECIFIED_CFLAGS" = x ; then
 eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
 	 | grep 'configure___' \
-	 | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
+	 | sed -n -e 's/^configure___ \([[^=]]*=\)\(.*\)$/\1"\2"/p'`
 else
 REAL_CFLAGS="$CFLAGS"
 fi
 rm ${tempcname}
 LISP_FLOAT_TYPE=yes
 #### Add the libraries to LIBS and check for some functions.
-]
 CPPFLAGS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $CPPFLAGS"
 DEFS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $DEFS"
 LIBS="${LD_SWITCH_SITE} $ld_switch_x_system $libsrc_libs $LIBS"
 dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
 dnl FSF 19.29 also checks for function gethostbyname.
 dnl AC_HAVE_LIBRARY(-lresolv)
 dnl Alternative to getloadavg() that doesn't require root priveleges
 AC_HAVE_LIBRARY(-lkstat)
+dnl Use -lintl if Mule available.
+AC_HAVE_LIBRARY(-lintl, AC_DEFINE(HAVE_LIBINTL))
 AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
 dnl FSF 19.29 also checks for function cma_open.
 AC_HAVE_LIBRARY(-lpthreads, HAVE_PTHREADS=yes)
 IF_YES_AC_DEFINE(need_xildoff,   NEED_XILDOFF)
 IF_YES_AC_DEFINE(with_gcc,       USE_GCC)
 IF_YES_AC_DEFINE(with_lcc,       USE_LCC)
 IF_YES_AC_DEFINE(with_socks,     HAVE_SOCKS)
 IF_YES_AC_DEFINE(with_term,      HAVE_TERM)
-IF_YES_AC_DEFINE(with_epoch,     EPOCH)
 IF_YES_AC_DEFINE(external_widget,EXTERNAL_WIDGET)
 IF_YES_AC_DEFINE(with_gnu_make,  USE_GNU_MAKE)
 IF_YES_AC_DEFINE(no_doc_file,    NO_DOC_FILE)
 IF_YES_AC_DEFINE(const_is_losing,CONST_IS_LOSING)
 IF_YES_AC_DEFINE(use_assertions, USE_ASSERTIONS)
 dnl ############################################################################
 (
 echo "uname -a: `uname -a`"
 echo ""
-echo "$0 $configure_args"
+echo "$0 $quoted_arguments"
 ) >> Installation
 # Start stdout redirection to '| tee -a Installation'
 (
 echo "
 elif test -n "$site_libraries"; then
 echo "  Additional libraries:                                   ${site_libraries}"
 elif test -n "$site_runtime_libraries"; then
 echo "  Additional libraries:                                   ${site_runtime_libraries}"
 fi
-if test "$with_wnn" = yes ; then
-echo "  Finding WNN includes with:                              ${wnn_includes}"
-echo "  Loading WNN libs with:                                  ${wnn_libraries}"
-fi
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
 test "$with_term"  = yes && echo "  Compiling in support for TERM."
 test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
 test "$with_xpm"   = yes && echo "  Compiling in support for XPM."
 if test "$with_xmu" != yes -a "$window_system" != none; then
 fi
 if test "$with_png" = gnuz; then
 echo "  (Using -lgz instead of -lz.)"
 fi
 test "$with_tiff"  = yes && echo "  Compiling in support for TIFF image conversion (not implemented)."
-test "$with_epoch" = yes && echo "  Compiling in extra Epoch compatibility."
 test "$with_sound" = nas    && echo "  Compiling in network sound support."
 test "$with_sound" = native && echo "  Compiling in native sound support."
 test "$with_sound" = both   && echo "  Compiling in both network and native sound support."
 test "$old_nas"    = true   && echo "        nas library lacks error trapping, will play synchronously"
 test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
 test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
 test "$with_xim" = motif    && echo "    Using Motif to provide XIM support."
 test "$with_xim" = xlib     && echo "    Using raw Xlib to provide XIM support."
 test "$with_canna"    = yes && echo "  Compiling in support for Canna on Mule."
-test "$with_wnn"      = yes && echo "  Compiling in support for WNN on Mule."
+if test "$with_wnn" = yes; then
-test "$with_wnn6"     = yes && echo "  WNN support for version 6."
+echo "  Compiling in support for the WNN input method on Mule."
+test "$with_wnn6" = yes && echo "    WNN support for version 6."
+echo "    Finding WNN includes with:                          ${wnn_includes}"
+echo "    Finding WNN libs with:                              ${wnn_libraries}"
+fi
 test "$with_i18n3"    = yes && echo "  Compiling in I18N support, level 3 (doesn't currently work)."
 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_scrollbars" = athena && echo "  Using the Athena scrollbar."
 test "$with_scrollbars" = athena3d && echo "  Using the Athena-3d scrollbar."
 test "$with_dialogs"    = motif  && echo "  Using the Motif dialog boxes."
 test "$with_dialogs"    = athena && echo "  Using the Athena dialog boxes."
 test "$with_dialogs"    = athena3d && echo "  Using the Athena-3d dialog boxes."
-test "$with_pop"	= yes && "Using POP for mail access"
+test "$with_pop"	= yes && "  Using POP for mail access"
-test "$with_kerberos"	= yes && "Using Kerberos for POP authentication"
+test "$with_kerberos"	= yes && "  Using Kerberos for POP authentication"
-test "$with_hesiod"	= yes && "Using Hesiod to get POP server host"
+test "$with_hesiod"	= yes && "  Using Hesiod to get POP server host"
 test "${use_union_type}"     = yes && echo "  Using the union type for Lisp_Objects."
 test "${debug}"              = yes && echo "  Compiling in extra code for debugging."
 test "${memory_usage_stats}" = yes && echo "  Compiling in code for checking XEmacs memory usage."
 test "$usage_tracking"       = yes && echo "  Compiling with usage tracking active (Sun internal)."
 dnl ############################################################################
 dnl #                                Now generate!                             #
 dnl ############################################################################
 dnl This has to be called in order for this variable to get into config.status
-AC_SUBST(internal_makefile_list) [
+AC_SUBST(internal_makefile_list)
 # Remove any trailing slashes in these variables.
 test -n "${prefix}" &&
-prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
+prefix=`echo "${prefix}" | sed 's,\([[^/]]\)/*$,\1,'`
 test -n "${exec_prefix}" &&
-exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
+exec_prefix=`echo "${exec_prefix}" | sed 's,\([[^/]]\)/*$,\1,'`
-]
-AC_OUTPUT($internal_makefile_list) [
+AC_OUTPUT($internal_makefile_list)
 # Build:
 # src/Makefile      from ${srcdir}/src/Makefile.in
 # lwlib/Makefile    from ${srcdir}/lwlib/Makefile.in
 # lib-src/Makefile  from ${srcdir}/lib-src/Makefile.in
 # dynodump/Makefile from ${srcdir}/dynodump/Makefile.in
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 rm -f junk.c;
 sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
 eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
 < junk.cpp							'\
 '    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
+'	-e '\''s/^[[ \f\t]][[ \f\t]]*$//'\''			'\
 '	-e '\''s/^ /	/'\'' 					'\
 '	| sed -n -e '\''/^..*$/p'\''				'\
 '	> Makefile.new;
 chmod 444 Makefile.new;
 mv -f Makefile.new Makefile;
 echo creating src/gdbinit
 echo source $topsrcdir/src/gdbinit > src/gdbinit
 fi
 exit 0
-]
+# Local Variables:
+# eval: (modify-syntax-entry ?\" "\"")
+# End:

Mercurial > hg > xemacs-beta

comparison configure.in @ 120:cca96a509cfe r20-1b12