xemacs-beta: configure comparison

comparison configure @ 5125:b5df3737028a ben-lisp-object

merge

author	Ben Wing <ben@xemacs.org>
date	Wed, 24 Feb 2010 01:58:04 -0600
parents	e0db3c197671 2ade80e8c640
children	b72f27a08ed5

comparison

equal deleted inserted replaced

-:623d57b7fbe8
+:b5df3737028a
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.65 for XEmacs 21.5.
 #
 # Report bugs to <xemacs-beta@xemacs.org>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Foundation, Inc.
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
 # Configuration script for XEmacs.  Largely divergent from FSF.
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 PROGNAME
 SUBDIR_MAKEFILES
 MAKE_SUBDIR
 INSTALL_ARCH_DEP_SUBDIR
 SRC_SUBDIR_DEPS
+ac_ct_CXX
+CXXFLAGS
+CXX
 have_esd_config
 ALLOCA
 canna_libs
 lwlib_objs
 postgresql_libs
 with_union_type
 enable_quantify
 with_quantify
 enable_purify
 with_purify
+enable_valgrind
+with_valgrind
 with_x
 '
 ac_precious_vars='build_alias
 host_alias
 target_alias
 LIBS
 CPPFLAGS
 CPP
 YACC
 YFLAGS
-XMKMF'
+XMKMF
+CXX
+CXXFLAGS
+CCC'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
 --with-gcc              Use GCC to compile XEmacs.
 --with-cflags=FLAGS     Compiler flags. These flags will be placed after any
 flags inserted for warnings, debugging or
 optimization; setting this does not disable the
 insertion of those flags. Use configure settings
-such as `--with-optimization=no' or
+such as `--with-optimization=no' or `with-debug=no'
-`enable-debug=no' to turn them off, or override them
+to turn them off, or override them with
-with `--with-cflags-optimization',
+`--with-cflags-optimization',
 `--with-cflags-debugging', or `with-cflags-warning'.
 --with-cflags-warning=FLAGS
 Override compiler flags used to control warnings.
 Normally, don't set this, as XEmacs already turns on
 the maximum safe warning level.
 --with-menubars=TYPE    Use TYPE menubars ('yes', '`no', `lucid', `motif',
 `athena', `gtk', or `msw'). The Lucid widgets
 emulate Motif (mostly) but are faster. *WARNING* The
 Motif menubar is currently broken. Lucid menubars
 are the default.
---with-scrollbars=TYPE
+--with-scrollbars=TYPE  Use TYPE scrollbars 'yes', '`no', `lucid', `motif',
-Use TYPE scrollbars 'yes', '`no', `lucid', `motif',
 `athena', `gtk', or `msw'). Lucid scrollbars are the
 default.
 --with-dialogs=TYPE     Use TYPE dialog boxes 'yes', '`no', `lucid',
 `motif', `athena', `gtk', or `msw'). There are no
 true Lucid dialogs; Motif dialogs will be used if
 automatically added if one of the drag and drop
 protocols is found (currently CDE, MSWindows, and
 GTK). *WARNING* The Drag'n'drop support is under
 development and is considered experimental.
 --with-cde              Compile in support for CDE drag and drop.
---with-external-widget
+--with-external-widget  Support XEmacs server for text widgets in other
-Support XEmacs server for text widgets in other
 applications.
 TTY (character terminal) options
 --------------------------------
 Requires Mule.
 --with-wnn6             Support the Wnn6 Asian language input method
 (proprietary). Requires Mule.
 --with-xfs              Enable XFontSet support for internationalized
 menubar. Incompatible with `--with-xim=motif' and
-`--with-xft'. `--with-menubars=lucid'   (the
+`--with-xft'. `--with-menubars=lucid' (the default)
-default) is desirable.
+is desirable.
 File-related options
 --------------------
 --with-default-eol-detection
 Turns on by default auto-detection of end-of-line
 type when reading a file. Applies to those platforms
 where auto-detection is off by default (non-Mule
 Unix). Has no effect otherwise.
---with-clash-detection
+--with-clash-detection  Disable use of lock files to detect multiple edits
-Disable use of lock files to detect multiple edits
 of the same file.
 --with-zlib             Support inflate (de)compression internally.
 Database options
 ----------------
 a SourceForge project).
 Debugging options
 -----------------
---with-debug            Enable additional debugging information. No time
+--with-debug            Enable additional debugging information. No
-cost.
+noticeable time cost (unlike
---with-error-checking=TESTS
+`--with-error-checking'). This turns adds `-g' to
+the compiler options so that debug information is
+compiled into the XEmacs executable. It also turns
+on assert checks in the source code (i.e. same as
+`--with-assertions'); enables Lisp commands for
+determining detailed memory usage statistics (same
+as `--with-memory-usage-stats'); adds various Lisp
+variables and functions that allow one to display
+internal structures, show the internal workings of
+certain subsystems, and exit to the debugger; causes
+Lisp errors during building to exit to the debugger
+or dump core; and adds debugging-related C functions
+meant to be called from a debugger.
+--with-error-checking=CLASS|all|none
 Compile with internal error-checking added. Causes
-noticeable loss of speed. Valid TESTS are
+noticeable loss of speed. Valid classes are
-`byte_code', `display', `extents', `gc', `glyphs',
+`byte_code', `display' (redisplay), `extents', `gc'
-`malloc', `structures' `text', `types'.
+(garbage collection), `glyphs', `malloc' (memory
+allocation), `structures' (C structures), `text'
+(text handling and conversion), `types' (correct
+Lisp-object type for type-specific operations).
+`all' or `none' can be given to set all or no
+classes, respectively. Any of the classes can be
+prefixed with `no' to turn the class off. A
+comma-separated list of classes can also be given.
+For example, `all,nogc' turns on all but
+garbage-collection-related checking. Omitting any
+argument or specifying just `yes' is the same as
+`all'.
 --with-assertions       Compile in runtime assertions.
 --with-memory-usage-stats
 Enable LISP memory usage API.
 --with-quick-build      Speed up the build cycle by leaving out steps where
 XEmacs will still work (more or less) without them.
 cause all .c files to be rebuilt.
 --with-union-type       Use union definition of Lisp_Object type. Known to
 trigger bugs in some compilers.
 --with-quantify         Support performance debugging using Quantify.
 --with-purify           Support memory debugging using Purify.
+--with-valgrind         Support memory debugging using Valgrind.
 Optional Packages:
 --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 --with-x                use the X Window System
 CC          C compiler command
 CFLAGS      C compiler flags
 LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
 nonstandard directory <lib dir>
 LIBS        libraries to pass to the linker, e.g. -l<library>
-CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 you have headers in a nonstandard directory <include dir>
 CPP         C preprocessor
 YACC        The `Yet Another C Compiler' implementation to use. Defaults to
 the first program found out of: `bison -y', `byacc', `yacc'.
 YFLAGS      The list of arguments that will be passed by default to $YACC.
 This script will default YFLAGS to the empty string to avoid a
 default value of `-d' given by some make applications.
 XMKMF       Path to xmkmf, Makefile generator for X Window System
+CXX         C++ compiler command
+CXXFLAGS    C++ compiler flags
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 Report bugs to <xemacs-beta@xemacs.org>.
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
 XEmacs configure 21.5
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-return $ac_retval
+as_fn_set_status $ac_retval
 } # ac_fn_c_try_compile
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 sed 's/^/| /' conftest.$ac_ext >&5
 ac_retval=1
 fi
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-return $ac_retval
+as_fn_set_status $ac_retval
 } # ac_fn_c_try_cpp
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 ac_retval=$ac_status
 fi
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-return $ac_retval
+as_fn_set_status $ac_retval
 } # ac_fn_c_try_run
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 # interfere with the next link command; also delete a directory that is
 # left behind by Apple's compiler.  We do this before executing the actions.
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-return $ac_retval
+as_fn_set_status $ac_retval
 } # ac_fn_c_try_link
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 rm -f conftest.val
 fi
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-return $ac_retval
+as_fn_set_status $ac_retval
 } # ac_fn_c_compute_int
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+rm -f conftest.$ac_objext
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+*) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+(eval "$ac_compile") 2>conftest.err
+ac_status=$?
+if test -s conftest.err; then
+grep -v '^ *+' conftest.err >conftest.er1
+cat conftest.er1 >&5
+mv -f conftest.er1 conftest.err
+fi
+$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+} && test -s conftest.$ac_objext; then :
+ac_retval=0
+else
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+	ac_retval=1
+fi
+eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+as_fn_set_status $ac_retval
+} # ac_fn_cxx_try_compile
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 It was created by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 $ $0 $@
 _ACEOF
 exec 5>>config.log
 ac_site_file2=$ac_default_prefix/etc/config.site
 fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
 test "x$ac_site_file" = xNONE && continue
-if test -r "$ac_site_file"; then
+if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 sed 's/^/| /' "$ac_site_file" >&5
 . "$ac_site_file"
 fi
 done
 if test -r "$cache_file"; then
-# Some versions of bash will fail to source /dev/null (special
+# Some versions of bash will fail to source /dev/null (special files
-# files actually), so we avoid doing that.
+# actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-if test -f "$cache_file"; then
+if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
 case $cache_file in
 [\\/]* | ?:[\\/]* ) . "$cache_file";;
 *)                      . "./$cache_file";;
 for y in $_sound_types; do
 eval "with_sound_$y=\$_sound_${y}_default"
 eval "enable_sound_$y=\$_sound_${y}_default"
 unset _sound_${y}_default
 done
-enable_sound_nas=""
+with_sound_nas=""
 fi;
 # If --with-native-sound-lib or --without-native-sound-lib were given then copy the value to the
 # equivalent enable_native-sound-lib variable.
 if test "${with_native_sound_lib+set}" = set; then
 enable_native_sound_lib="$with_native_sound_lib"
 done
 unset _database_types _database_default _database_all_default _database_use_defaults
 unset _with_database_args _database_found x y _require_database
-if test "$enable_database_dbm"  = "yes" -a "$enable_database_gdbm" = "yes"; then
+if test "$with_database_dbm"  = "yes" -a "$with_database_gdbm" = "yes"; then
 	(echo "$progname: Usage error:"
 echo " " "Only one of \`dbm' and \`gdbm' may be specified
 with the \`--with-database' option."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 if test "${with_kkcc+set}" = set; then
 enableval="$with_kkcc"
 withval="$with_kkcc"
 else
-enable_kkcc=yes
+with_kkcc=yes
 fi;
 # If --with-newgc or --without-newgc were given then copy the value to the
 # equivalent enable_newgc variable.
 if test "${with_newgc+set}" = set; then
 for y in $_vdb_types; do
 eval "with_vdb_$y=\$_vdb_${y}_default"
 eval "enable_vdb_$y=\$_vdb_${y}_default"
 unset _vdb_${y}_default
 done
-enable_vdb="auto"
+with_vdb="auto"
 fi;
 # If --with-modules or --without-modules were given then copy the value to the
 # equivalent enable_modules variable.
 if test "${with_modules+set}" = set; then
 unset _bignum_bogus
 else
-enable_bignum="no"
+with_bignum="no"
 fi;
 # If --with-workshop or --without-workshop were given then copy the value to the
 # equivalent enable_workshop variable.
 if test "${with_workshop+set}" = set; then
 if test "${with_debug+set}" = set; then
 enableval="$with_debug"
 withval="$with_debug"
 fi;
+if test "$with_error_checking" = "yes"; then
+with_error_checking=all
+fi
 _error_checking_notfirst=""
 _error_checking_byte_code_default=""
 _error_checking_display_default=""
 _error_checking_extents_default=""
 _error_checking_gc_default=""
 if test "${with_purify+set}" = set; then
 enableval="$with_purify"
 withval="$with_purify"
 fi;
+# If --with-valgrind or --without-valgrind were given then copy the value to the
+# equivalent enable_valgrind variable.
+if test "${with_valgrind+set}" = set; then
+enable_valgrind="$with_valgrind"
+fi;
+# If -enable-valgrind or --disable-valgrind were given then copy the value to the
+# equivalent with_valgrind variable.
+if test "${enable_valgrind+set}" = set; then
+with_valgrind="$enable_valgrind"
+fi;
+# Check whether --with-valgrind or --without-valgrind was given.
+if test "${with_valgrind+set}" = set; then
+enableval="$with_valgrind"
+withval="$with_valgrind"
+fi;
 if test "$with_purify" = "yes" -o "$with_quantify" = "yes"; then
 test "$with_system_malloc" = "default" && with_system_malloc=yes
 fi
 #define SHEBANG_PROGNAME "${PROGNAME}-script"
 _ACEOF
 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${enable_error_checking_extents:=$beta}"    = yes && $as_echo "#define ERROR_CHECK_EXTENTS 1" >>confdefs.h
+test "${with_error_checking_extents:=$beta}"    = yes && $as_echo "#define ERROR_CHECK_EXTENTS 1" >>confdefs.h
-test "${enable_error_checking_types:=$beta}"      = yes && $as_echo "#define ERROR_CHECK_TYPES 1" >>confdefs.h
+test "${with_error_checking_types:=$beta}"      = yes && $as_echo "#define ERROR_CHECK_TYPES 1" >>confdefs.h
-test "${enable_error_checking_text:=$beta}"       = yes && $as_echo "#define ERROR_CHECK_TEXT 1" >>confdefs.h
+test "${with_error_checking_text:=$beta}"       = yes && $as_echo "#define ERROR_CHECK_TEXT 1" >>confdefs.h
-test "${enable_error_checking_gc:=$beta}"         = yes && $as_echo "#define ERROR_CHECK_GC 1" >>confdefs.h
+test "${with_error_checking_gc:=$beta}"         = yes && $as_echo "#define ERROR_CHECK_GC 1" >>confdefs.h
-test "${enable_error_checking_malloc:=$beta}"     = yes && $as_echo "#define ERROR_CHECK_MALLOC 1" >>confdefs.h
+test "${with_error_checking_malloc:=$beta}"     = yes && $as_echo "#define ERROR_CHECK_MALLOC 1" >>confdefs.h
-test "${enable_error_checking_byte_code:=$beta}"  = yes && $as_echo "#define ERROR_CHECK_BYTE_CODE 1" >>confdefs.h
+test "${with_error_checking_byte_code:=$beta}"  = yes && $as_echo "#define ERROR_CHECK_BYTE_CODE 1" >>confdefs.h
-test "${enable_error_checking_glyphs:=$beta}"     = yes && $as_echo "#define ERROR_CHECK_GLYPHS 1" >>confdefs.h
+test "${with_error_checking_glyphs:=$beta}"     = yes && $as_echo "#define ERROR_CHECK_GLYPHS 1" >>confdefs.h
-test "${enable_error_checking_display:=$beta}"    = yes && $as_echo "#define ERROR_CHECK_DISPLAY 1" >>confdefs.h
+test "${with_error_checking_display:=$beta}"    = yes && $as_echo "#define ERROR_CHECK_DISPLAY 1" >>confdefs.h
-test "${enable_error_checking_structures:=$beta}" = yes && $as_echo "#define ERROR_CHECK_STRUCTURES 1" >>confdefs.h
+test "${with_error_checking_structures:=$beta}" = yes && $as_echo "#define ERROR_CHECK_STRUCTURES 1" >>confdefs.h
-if test "${enable_debug:=$beta}" = "yes"; then
+if test "${with_debug:=$beta}" = "yes"; then
-enable_assertions=yes
+with_assertions=yes
-enable_memory_usage_stats=yes
+with_memory_usage_stats=yes
 $as_echo "#define DEBUG_XEMACS 1" >>confdefs.h
 fi
-test "$enable_assertions"         = "yes" && $as_echo "#define USE_ASSERTIONS 1" >>confdefs.h
+test "$with_assertions"         = "yes" && $as_echo "#define USE_ASSERTIONS 1" >>confdefs.h
-test "$enable_memory_usage_stats" = "yes" && $as_echo "#define MEMORY_USAGE_STATS 1" >>confdefs.h
+test "$with_memory_usage_stats" = "yes" && $as_echo "#define MEMORY_USAGE_STATS 1" >>confdefs.h
 ac_cv_build_alias=`echo "$ac_cv_build_alias" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 ac_cv_build=`echo "$ac_cv_build" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 echo "Using configure-time autodetection only."
 fi
-if test -z "$enable_pdump"; then
+if test -z "$with_pdump"; then
 case "$opsys" in
-linux* )  enable_pdump=yes ;;              darwin )  enable_pdump=yes ;;              cygwin* ) enable_pdump=yes ;;              * )       enable_pdump=no ;;
+linux* )  with_pdump=yes ;;              darwin )  with_pdump=yes ;;              cygwin* ) with_pdump=yes ;;              * )       with_pdump=no ;;
 esac
 fi
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-if test "$enable_vdb" = "auto"; then
+if test "$with_vdb" = "auto"; then
 case "$opsys" in
 darwin )  case "$machine" in
 		  i[3-9]86 ) check_vdb_posix=yes ;;
 		  * ) $as_echo "#define VDB_MACH 1" >>confdefs.h
 have_vdb_mach=yes ;;
 linux* )  check_vdb_posix=yes ;;
 freebsd ) check_vdb_posix=yes ;;
 * )       check_vdb_posix=yes ;;
 esac
 else
-case "$enable_vdb" in
+case "$with_vdb" in
 mach )  $as_echo "#define VDB_MACH 1" >>confdefs.h
 have_vdb_mach=yes ;;
 win32 ) $as_echo "#define VDB_WIN32 1" >>confdefs.h
 have_vdb_win32=yes ;;
 posix ) check_vdb_posix=yes ;;
 if test "$with_workshop" = "yes"; then
 $as_echo "#define SUNPRO 1" >>confdefs.h
 fi
-if test "$enable_clash_detection" != "no"; then
+if test "$with_clash_detection" != "no"; then
 $as_echo "#define CLASH_DETECTION 1" >>confdefs.h
 fi
 test -n "$with_compiler" && CC="$with_compiler"
 if test -s conftest.err; then
 sed '10a\
 ... rest of stderr output deleted ...
 10q' conftest.err >conftest.er1
 cat conftest.er1 >&5
-rm -f conftest.er1 conftest.err
 fi
+rm -f conftest.er1 conftest.err
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
-return ferror (f) || fclose (f) != 0;
 ;
 return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
 ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-$as_echo "$as_me: failed program was:" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
-fi
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run.  If not, either
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-if { ac_try='./$ac_file'
-{ { case "(($ac_try" in
-*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-*) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-(eval "$ac_try") 2>&5
-ac_status=$?
-$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-test $ac_status = 0; }; }; then
-cross_compiling=no
-else
-if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+return ferror (f) || fclose (f) != 0;
+;
+return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+{ { ac_try="$ac_link"
+case "(($ac_try" in
+*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+*) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+(eval "$ac_link") 2>&5
+ac_status=$?
+$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+test $ac_status = 0; }
+if { ac_try='./conftest$ac_cv_exeext'
+{ { case "(($ac_try" in
+*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+*) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+(eval "$ac_try") 2>&5
+ac_status=$?
+$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+test $ac_status = 0; }; }; then
+cross_compiling=no
+else
+if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
 $as_echo_n "(cached) " >&6
 else
 if test -s conftest.err; then
 sed '10a\
 ... rest of stderr output deleted ...
 10q' conftest.err >conftest.er1
 cat conftest.er1 >&5
-rm -f conftest.er1 conftest.err
 fi
+rm -f conftest.er1 conftest.err
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 if test -s conftest.err; then
 sed '10a\
 ... rest of stderr output deleted ...
 10q' conftest.err >conftest.er1
 cat conftest.er1 >&5
-rm -f conftest.er1 conftest.err
 fi
+rm -f conftest.er1 conftest.err
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 if test -s conftest.err; then
 sed '10a\
 ... rest of stderr output deleted ...
 10q' conftest.err >conftest.er1
 cat conftest.er1 >&5
-rm -f conftest.er1 conftest.err
 fi
+rm -f conftest.er1 conftest.err
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 test -n "$with_xemacs_compiler" && XEMACS_CC="$with_xemacs_compiler"
 : ${XEMACS_CC:="$CC"}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using g++" >&5
+$as_echo_n "checking whether we are using g++... " >&6; }
+XEMACS_CC_GPP=no
+case "$XEMACS_CC" in
+*g++* ) XEMACS_CC_GPP=yes ;;
+esac
+if test "$XEMACS_CC_GPP" = "no" -a "$GCC" = "yes"; then
+case "`$XEMACS_CC --version`" in
+g++* ) XEMACS_CC_GPP=yes ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XEMACS_CC_GPP" >&5
+$as_echo "$XEMACS_CC_GPP" >&6; }
 test -n "$CPP" -a -d "$CPP" && CPP=
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 ac_ext=c
 cat >>confdefs.h <<_ACEOF
 #define SYSTEM_TYPE "`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
 _ACEOF
-test -z "$unexec" && enable_pdump=yes
+test -z "$unexec" && with_pdump=yes
-if test "$enable_pdump" = "yes"; then
+if test "$with_pdump" = "yes"; then
 ordinary_link="yes"
 ld="${ordinary_ld}"
 start_files=
 libs_standard=
 unexec=
 lib_gcc=
 fi
-test -z "$enable_kkcc" && enable_kkcc=yes
+test -z "$with_kkcc" && with_kkcc=yes
-if test -z "$enable_dump_in_exec"; then
+if test -z "$with_dump_in_exec"; then
-if test "$enable_pdump" = "yes"; then
+if test "$with_pdump" = "yes"; then
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-enable_dump_in_exec=no
+with_dump_in_exec=no
 else
-enable_dump_in_exec=yes
+with_dump_in_exec=yes
 fi
 fi
 fi
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-enable_kkcc=yes
+with_kkcc=yes
 fi
 test "$verbose" = "yes" && \
 for var in libs_machine libs_system libs_termcap libs_standard   objects_machine objects_system c_switch_machine c_switch_system   ld_switch_machine ld_switch_system unexec ld_switch_shared   ld lib_gcc ld_text_start_addr start_files ordinary_link   have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
 fi
 xemacs_cc_cc_mismatch=no
 if test "$CC" != "$XEMACS_CC"; then
-case "$XEMACS_CC" in
+if test "$XEMACS_CC_GPP" = "yes" -a "$GCC" != "yes"; then
-*g++* )
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&5
-if test "$GCC" != "yes"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&5
 $as_echo "$as_me: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&2;}
 xemacs_cc_cc_mismatch=yes
 fi
-;;
+if test -n "$GCC" -a "$XEMACS_CC_GPP" != "yes" ; then
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&5
-if test -n "$GCC"; then
-case $XEMACS_CC in
-*g++* )
-# it's as expected, do nothing
-;;
-* )
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&5
 $as_echo "$as_me: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&2;}
 xemacs_cc_cc_mismatch=yes
-;;
-esac
 fi
 fi
 if test -z "$with_optimization"; then
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred optimization flags" >&5
 $as_echo_n "checking for preferred optimization flags... " >&6; }
-if test "$with_optimization" = "yes" ; then
+if test "$cflags_optimization_specified" = "no"; then
-if test "$cflags_optimization_specified" = "no"; then
+if test "$with_optimization" = "yes" ; then
 if test "$GCC" = "yes"; then
-with_cflags_optimization="-O3"
+with_cflags_optimization="-O3 -fno-strict-aliasing"
 elif test "$__SUNPRO_C" = "yes"; then
 case "$opsys" in
 sol2    ) with_cflags_optimization="-xO4" ;;
 esac
 elif test "$__DECC" = "yes"; then
 with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000"
 elif test "$__ICC" = "yes"; then
 with_cflags_optimization="-O3 -Ob2"
 else
 with_cflags_optimization="-O" ;    fi
+elif test "$XEMACS_CC_GPP" = "yes" ; then
+with_cflags_optimization="-fno-strict-aliasing"
 fi
-else
-with_cflags_optimization=
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_optimization}" >&5
 $as_echo "${with_cflags_optimization}" >&6; }
 with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts"
 test "$__GCC" -ge 3 && with_cflags_warning="$with_cflags_warning -Wpacked"
 test "$have_glibc" != "yes" && \
 with_cflags_warning="$with_cflags_warning -Wpointer-arith"
-if test "$with_xemacs_compiler" = "g++"; then
+with_cflags_warning_c="-Wshadow -Wmissing-declarations"
-xe_cflags_warning="$with_cflags_warning -Weffc++"
+with_cflags_warning_c="$with_cflags_warning_c -Wmissing-prototypes -Wstrict-prototypes"
-elif test "$__GCC" -ge 3; then
+with_cflags_warning_cxx="-Weffc++"
-xe_cflags_warning="$with_cflags_warning -Wunused-parameter"
+with_cflags_warning_c_xe=""
+if test "$__GCC" -ge 3; then
+with_cflags_warning_c_xe="$with_cflags_warning_c_xe -Wunused-parameter"
 if test "$__GCC" -gt 3 || test "$__GCC_MINOR" -ge 4; then
-with_cflags_warning="$with_cflags_warning -Wdeclaration-after-statement"
+with_cflags_warning_c="$with_cflags_warning_c -Wdeclaration-after-statement"
 fi
 fi
-with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations"
+if test "$XEMACS_CC_GPP" = "yes"; then
-with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes"
+xe_cflags_warning="$with_cflags_warning $with_cflags_warning_cxx"
-elif test "$__ICC" = "yes"; then
+else
-with_cflags_warning="-Wall -w1 -we147"
+xe_cflags_warning="$with_cflags_warning $with_cflags_warning_c $with_cflags_warning_c_xe"
+fi
+with_cflags_warning="$with_cflags_warning $with_cflags_warning_c"
+elif test "$__ICC" = "yes"; then
+with_cflags_warning="-Wall -w1 -we147"
 fi
 fi
 test -z "$xe_cflags_warning" && xe_cflags_warning="$with_cflags_warning"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${xe_cflags_warning}" >&5
 $as_echo "${xe_cflags_warning}" >&6; }
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-if test "$enable_pdump" != "yes"; then
+if test "$with_pdump" != "yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"-z nocombreloc\" linker flag" >&5
 $as_echo_n "checking for \"-z nocombreloc\" linker flag... " >&6; }
 case "`ld --help 2>&1`" in
 *-z\ nocombreloc* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 echo "    xemacs will be linked with \"$objects_machine\""
 fi
 test -n "$objects_system"  && extra_objs="$extra_objs $objects_system" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"$objects_system\""
 fi
-test -n "$unexec"          && test ! "$enable_pdump" = "yes" && extra_objs="$extra_objs $unexec" &&  if test "$verbose" = "yes"; then
+test -n "$unexec"          && test ! "$with_pdump" = "yes" && extra_objs="$extra_objs $unexec" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"$unexec\""
 fi
-test "$enable_pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$verbose" = "yes"; then
+test "$with_pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"dumper.o\""
 fi
 	with_x11=no
 fi
 for feature in scrollbars toolbars menubars dialogs widgets
 do
-eval "feature_value=\${enable_${feature}}"
+eval "feature_value=\${with_${feature}}"
 	case "${feature_value}" in
 	yes|no|gtk|"" )
 	    ;;
 	* )
 	  feature_conflict_with_gtk=yes
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-${feature}=${feature_value} is incompatible with --with-gtk" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature}=${feature_value} is incompatible with --with-gtk" >&5
-$as_echo "$as_me: WARNING: --enable-${feature}=${feature_value} is incompatible with --with-gtk" >&2;} ;;
+$as_echo "$as_me: WARNING: --with-${feature}=${feature_value} is incompatible with --with-gtk" >&2;} ;;
 	esac
 done
 if test "${feature_conflict_with_gtk}" = "yes"; then
 	{ echo "Error:" "One or more GUI toolkit features conflict with GTK" >&2; exit 1; }
 fi
-test "${enable_scrollbars}" != "no" && enable_scrollbars=gtk
+test "${with_scrollbars}" != "no" && with_scrollbars=gtk
-test "${enable_toolbars}" != "no" && enable_toolbars=gtk
+test "${with_toolbars}" != "no" && with_toolbars=gtk
-test "${enable_menubars}" != "no" && enable_menubars=gtk
+test "${with_menubars}" != "no" && with_menubars=gtk
-test "${enable_dialogs}" != "no" && enable_dialogs=gtk
+test "${with_dialogs}" != "no" && with_dialogs=gtk
-test "${enable_widgets}" != "no" && enable_widgets=gtk
+test "${with_widgets}" != "no" && with_widgets=gtk
 OLD_CFLAGS="${CFLAGS}"
 OLD_CPPFLAGS="${CPPFLAGS}"
 OLD_LDFLAGS="${LDFLAGS}"
 CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
 #define THIS_IS_X11R${x11_release} 1
 _ACEOF
 if test "${x11_release}" = "4"; then
-case "$enable_widgets" in
+case "$with_widgets" in
-"" | "no") enable_widgets=no ;;
+"" | "no") with_widgets=no ;;
 *) { echo "Error:" "Widget support requires X11R5 or greater" >&2; exit 1; } ;;
 esac
 fi
 for ac_func in XConvertCase XtRegisterDrawable
 done
 with_fontconfig=yes
 $as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h
-$as_echo "#define USE_XFT 1" >>confdefs.h
+$as_echo "#define HAVE_XFT 1" >>confdefs.h
 unset xft_includes_found
 fi
 fi
 dragndrop_proto="$dragndrop_proto msw" &&  if test "$verbose" = "yes"; then echo "    Appending \"msw\" to \$dragndrop_proto"; fi
 with_dragndrop=yes
 fi
 if test "$window_system" != x11; then
 window_system=msw
-test "$enable_scrollbars" != "no" && enable_scrollbars=msw
+test "$with_scrollbars" != "no" && with_scrollbars=msw
-test "$enable_menubars"   != "no" && enable_menubars=msw
+test "$with_menubars"   != "no" && with_menubars=msw
-test "$enable_toolbars"   != "no" && enable_toolbars=msw
+test "$with_toolbars"   != "no" && with_toolbars=msw
-test "$enable_dialogs"    != "no" && enable_dialogs=msw
+test "$with_dialogs"    != "no" && with_dialogs=msw
-test "$enable_widgets"    != "no" && enable_widgets=msw
+test "$with_widgets"    != "no" && with_widgets=msw
 fi
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot run test program while cross compiling
 test -z "$window_system" && window_system="none"
 if test "$window_system" = "none"; then
 for feature in menubars scrollbars toolbars dialogs dragndrop xface
 do
-if eval "test -n \"\$enable_${feature}\" -a \"\$enable_${feature}\" != no" ; then
+if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-$feature ignored:  Not valid without window system support" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-$feature ignored:  Not valid without window system support" >&5
-$as_echo "$as_me: WARNING: --enable-$feature ignored:  Not valid without window system support" >&2;}
+$as_echo "$as_me: WARNING: --with-$feature ignored:  Not valid without window system support" >&2;}
 fi
-eval "enable_${feature}=no"
+eval "with_${feature}=no"
 done
 else
-test -z "$enable_toolbars" && enable_toolbars=yes
+test -z "$with_toolbars" && with_toolbars=yes
 fi
 if test "$with_msw" != "yes"; then
 for feature in   MARTIN_IS_CLUELESS_ABOUT_MSW_FEATURES
 do
 else
 :
 fi
 if test "$with_x11" != "yes"; then
-for feature in with_tooltalk with_cde with_wmcommand with_xim enable_sound_nas
+for feature in with_tooltalk with_cde with_wmcommand with_xim with_sound_nas
 do
 if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --$feature ignored:  Not valid without X support" >&5
 $as_echo "$as_me: WARNING: --$feature ignored:  Not valid without X support" >&2;}
 fi
-if test "$with_xemacs_compiler" = "g++"; then
+if test "$XEMACS_CC_GPP" = "yes"; then
 LIBSTDCPP=-lstdc++
 else
 LIBSTDCPP=
 fi
-if test "$enable_modules" != "no"; then
+if test "$with_modules" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5
 $as_echo_n "checking for module support... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 can_build_shared=no
 fi
 fi # End of if cc_produces_so = no
-if test "$xe_gnu_ld" = yes; then
+if test "$xe_gnu_ld" = yes -a "$ld_shlibs" = yes; then
-if test "$ld_shlibs" = yes; then
+case "$xehost_os" in
+*cygwin* | *mingw* )
+# -export-all-symbols is the PE equivalent of ELF-specific -export-dynamic
+ld_dynamic_link_flags="${wl}-export-all-symbols"
+;;
+*)
 ld_dynamic_link_flags="${wl}-export-dynamic"
-fi
+;;
+esac
 fi
 if test -z "$ld_dynamic_link_flags"; then
 case "$xehost_os" in
 aix[3-9]*)
 _ACEOF
 fi
 done
-enable_modules=yes
+with_modules=yes
 MOD_CC="../../lib-src/ellcc"
 MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$@ -I../../src -I\$(srcdir)/../../src"
 INSTALLPATH="\$(moduledir)"
 MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM}
 OBJECT_TO_BUILD="\$(MODNAME).ell"
 else
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 { echo "Error:" "Required module support cannot be provided." >&2; exit 1; }
 else
 echo "    No module support."
 fi
-enable_modules=no
+with_modules=no
 fi
 fi
-if test "$enable_modules" != "yes"; then
+if test "$with_modules" != "yes"; then
 MOD_CC="$XEMACS_CC"
 MODCFLAGS="\$(XE_CFLAGS) -I../../src -I\$(srcdir)/../../src"
 INSTALLPATH=""
 MOD_INSTALL_PROGRAM="true"
 OBJECT_TO_BUILD="\$(MODNAME).o"
 fi
 MODARCHDIR=
 MAKE_DOCFILE="../../lib-src/make-docfile"
-with_modules=$enable_modules
+with_modules=$with_modules
 done
 LIBS="$save_LIBS"
 MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" &&  if test "$verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
 need_modules_common=yes
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" &&  if test "$verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
 fi
 fi
 _ACEOF
 postgresql_libs="$pq_libs $postgresql_libs" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$pq_libs\" to \$postgresql_libs"; fi
 MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" &&  if test "$verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
 need_modules_common=yes
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" &&  if test "$verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
 fi
 elif test "$with_postgresql" = "yes"; then
 { echo "Error:" "Required PostgreSQL support cannot be provided.  Check --with-site-prefixes." >&2; exit 1; }
 fi
 $as_echo_n "checking for X11 graphics libraries... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 fi
-case "$enable_widgets" in
+case "$with_widgets" in
 "" | "yes" | "athena")	detect_athena=yes ;;
 *)				detect_athena=no ;;
 esac
-case "$enable_dialogs" in
+case "$with_dialogs" in
 "" | "yes" | "athena")	detect_athena=yes ;;
 esac
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Athena widgets" >&5
 case "$opsys" in
 *linux* | *darwin* | *bsd* | *cygwin* )  lucid_prefers_motif="no"  ;;
 * )        lucid_prefers_motif="yes" ;;
 esac
-case "$enable_menubars" in "" | "yes" | "athena" )
+case "$with_menubars" in "" | "yes" | "athena" )
-enable_menubars="lucid" ;;
+with_menubars="lucid" ;;
 esac
 if test "$with_xft_menubars" != "no" ; then
 if test "$with_xft_emacs" = "yes" -a "$with_menubars" != "no" ; then
 with_xft_menubars="yes"
 else
 with_xft_menubars="no"
 fi
 fi
-case "$enable_dialogs" in "" | "yes" | "lucid" )
+case "$with_dialogs" in "" | "yes" | "lucid" )
 if test "$lucid_prefers_motif" = "yes"; then
-if   test "$have_motif"     = "yes"; then enable_dialogs="motif"
+if   test "$have_motif"     = "yes"; then with_dialogs="motif"
-elif test "$have_xaw"       = "yes"; then enable_dialogs="athena"
+elif test "$have_xaw"       = "yes"; then with_dialogs="athena"
-elif test "$with_msw"       = "yes"; then enable_dialogs="msw"
+elif test "$with_msw"       = "yes"; then with_dialogs="msw"
-else enable_dialogs=no
+else with_dialogs=no
 fi
 else
-if   test "$have_xaw"       = "yes"; then enable_dialogs="athena"
+if   test "$have_xaw"       = "yes"; then with_dialogs="athena"
-elif test "$have_motif"     = "yes"; then enable_dialogs="motif"
+elif test "$have_motif"     = "yes"; then with_dialogs="motif"
-elif test "$with_msw"       = "yes"; then enable_dialogs="msw"
+elif test "$with_msw"       = "yes"; then with_dialogs="msw"
-else enable_dialogs=no
+else with_dialogs=no
 fi
 fi ;;
 esac
-case "$enable_scrollbars" in "" | "yes" )
+case "$with_scrollbars" in "" | "yes" )
-enable_scrollbars="lucid" ;;
+with_scrollbars="lucid" ;;
 esac
-case "$enable_widgets" in "" | "yes" | "lucid")
+case "$with_widgets" in "" | "yes" | "lucid")
 if test "$lucid_prefers_motif" = "yes"; then
-if   test "$have_motif" = "yes"; then enable_widgets="motif"
+if   test "$have_motif" = "yes"; then with_widgets="motif"
-elif test "$have_xaw"   = "yes"; then enable_widgets="athena"
+elif test "$have_xaw"   = "yes"; then with_widgets="athena"
-elif test "$with_msw"   = "yes"; then enable_widgets="msw"
+elif test "$with_msw"   = "yes"; then with_widgets="msw"
-else enable_widgets=no
+else with_widgets=no
 fi
 else
-if   test "$have_xaw"   = "yes"; then enable_widgets="athena"
+if   test "$have_xaw"   = "yes"; then with_widgets="athena"
-elif test "$have_motif" = "yes"; then enable_widgets="motif"
+elif test "$have_motif" = "yes"; then with_widgets="motif"
-elif test "$with_msw"   = "yes"; then enable_widgets="msw"
+elif test "$with_msw"   = "yes"; then with_widgets="msw"
-else enable_widgets=no
+else with_widgets=no
 fi
 fi ;;
 esac
 if test "$with_xft_tabs" != "no" ; then
-if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
+if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
 with_xft_tabs="yes"
 else
 with_xft_tabs="no"
 fi
 fi
 if test "$with_xft_gauges" != "no" ; then
-if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
+if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
 with_xft_gauges="yes"
 else
 with_xft_gauges="no"
 fi
 fi
-all_widgets="$enable_menubars $enable_scrollbars $enable_dialogs $enable_toolbars $enable_widgets"
+all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets"
 case "$all_widgets" in
 *athena* )
 if test "$have_xaw" != "yes"; then
 { echo "Error:" "Could not find a suitable Athena library to build with." >&2; exit 1; }
 lwlib_objs="$lwlib_objs lwlib-Xm.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"lwlib-Xm.o\" to \$lwlib_objs"; fi
 need_motif=yes ;;
 esac
-test "$enable_menubars"   = "lucid" && lwlib_objs="$lwlib_objs xlwmenu.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$with_menubars"   = "lucid" && lwlib_objs="$lwlib_objs xlwmenu.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
-test "$enable_menubars"   = "motif" && lwlib_objs="$lwlib_objs xlwmenu.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$with_menubars"   = "motif" && lwlib_objs="$lwlib_objs xlwmenu.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
-test "$enable_scrollbars" = "lucid" && lwlib_objs="$lwlib_objs xlwscrollbar.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwscrollbar.o\" to \$lwlib_objs"; fi
+test "$with_scrollbars" = "lucid" && lwlib_objs="$lwlib_objs xlwscrollbar.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwscrollbar.o\" to \$lwlib_objs"; fi
-test "$enable_widgets"   != "no" && test "$enable_widgets" != "msw" && \
+test "$with_widgets"   != "no" && test "$with_widgets" != "msw" && \
 	lwlib_objs="$lwlib_objs xlwtabs.o xlwgcs.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwtabs.o xlwgcs.o\" to \$lwlib_objs"; fi
-case "$enable_widgets" in athena* )
+case "$with_widgets" in athena* )
 	lwlib_objs="$lwlib_objs xlwradio.o xlwcheckbox.o xlwgauge.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"xlwradio.o xlwcheckbox.o xlwgauge.o\" to \$lwlib_objs"; fi;;
 esac
 case "$all_widgets" in *lucid* )
 $as_echo "#define NEED_LUCID 1" >>confdefs.h
 lwlib_objs="$lwlib_objs lwlib-Xlw.o" &&  if test "$verbose" = "yes"; then echo "    Appending \"lwlib-Xlw.o\" to \$lwlib_objs"; fi ;;
 esac
-test "$enable_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA 1" >>confdefs.h
+test "$with_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA 1" >>confdefs.h
-test "$enable_dialogs"    = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA 1" >>confdefs.h
+test "$with_dialogs"    = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA 1" >>confdefs.h
 if test "$athena_3d" = "yes"; then
-test "$enable_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA3D 1" >>confdefs.h
+test "$with_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA3D 1" >>confdefs.h
-test "$enable_dialogs"    = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA3D 1" >>confdefs.h
+test "$with_dialogs"    = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA3D 1" >>confdefs.h
 fi
-case "$enable_widgets" in athena* ) $as_echo "#define LWLIB_WIDGETS_ATHENA 1" >>confdefs.h
+case "$with_widgets" in athena* ) $as_echo "#define LWLIB_WIDGETS_ATHENA 1" >>confdefs.h
 ;; esac
-test "$enable_widgets" != "no" && test "$enable_widgets" != "msw" && \
+test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \
 	$as_echo "#define LWLIB_TABS_LUCID 1" >>confdefs.h
-test "$enable_menubars"   != "no"    && $as_echo "#define HAVE_MENUBARS 1" >>confdefs.h
+test "$with_menubars"   != "no"    && $as_echo "#define HAVE_MENUBARS 1" >>confdefs.h
-test "$enable_scrollbars" != "no"    && $as_echo "#define HAVE_SCROLLBARS 1" >>confdefs.h
+test "$with_scrollbars" != "no"    && $as_echo "#define HAVE_SCROLLBARS 1" >>confdefs.h
-test "$enable_dialogs"    != "no"    && $as_echo "#define HAVE_DIALOGS 1" >>confdefs.h
+test "$with_dialogs"    != "no"    && $as_echo "#define HAVE_DIALOGS 1" >>confdefs.h
-test "$enable_toolbars"   != "no"    && $as_echo "#define HAVE_TOOLBARS 1" >>confdefs.h
+test "$with_toolbars"   != "no"    && $as_echo "#define HAVE_TOOLBARS 1" >>confdefs.h
-test "$enable_widgets"    != "no"    && $as_echo "#define HAVE_WIDGETS 1" >>confdefs.h
+test "$with_widgets"    != "no"    && $as_echo "#define HAVE_WIDGETS 1" >>confdefs.h
-test "$enable_menubars"   = "lucid"  && $as_echo "#define LWLIB_MENUBARS_LUCID 1" >>confdefs.h
+test "$with_menubars"   = "lucid"  && $as_echo "#define LWLIB_MENUBARS_LUCID 1" >>confdefs.h
-test "$enable_scrollbars" = "lucid"  && $as_echo "#define LWLIB_SCROLLBARS_LUCID 1" >>confdefs.h
+test "$with_scrollbars" = "lucid"  && $as_echo "#define LWLIB_SCROLLBARS_LUCID 1" >>confdefs.h
-test "$enable_menubars"   = "motif"  && $as_echo "#define LWLIB_MENUBARS_MOTIF 1" >>confdefs.h
+test "$with_menubars"   = "motif"  && $as_echo "#define LWLIB_MENUBARS_MOTIF 1" >>confdefs.h
-test "$enable_scrollbars" = "motif"  && $as_echo "#define LWLIB_SCROLLBARS_MOTIF 1" >>confdefs.h
+test "$with_scrollbars" = "motif"  && $as_echo "#define LWLIB_SCROLLBARS_MOTIF 1" >>confdefs.h
-test "$enable_dialogs"    = "motif"  && $as_echo "#define LWLIB_DIALOGS_MOTIF 1" >>confdefs.h
+test "$with_dialogs"    = "motif"  && $as_echo "#define LWLIB_DIALOGS_MOTIF 1" >>confdefs.h
-test "$enable_widgets"    = "motif"  && $as_echo "#define LWLIB_WIDGETS_MOTIF 1" >>confdefs.h
+test "$with_widgets"    = "motif"  && $as_echo "#define LWLIB_WIDGETS_MOTIF 1" >>confdefs.h
-test "$with_xft_menubars" = "yes"  && $as_echo "#define USE_XFT_MENUBARS 1" >>confdefs.h
+test "$with_xft_menubars" = "yes"  && $as_echo "#define HAVE_XFT_MENUBARS 1" >>confdefs.h
-test "$with_xft_tabs" = "yes"  && $as_echo "#define USE_XFT_TABS 1" >>confdefs.h
+test "$with_xft_tabs" = "yes"  && $as_echo "#define HAVE_XFT_TABS 1" >>confdefs.h
-test "$with_xft_gauges" = "yes"  && $as_echo "#define USE_XFT_GAUGES 1" >>confdefs.h
+test "$with_xft_gauges" = "yes"  && $as_echo "#define HAVE_XFT_GAUGES 1" >>confdefs.h
-test -z "$enable_mule" && enable_mule=no
+test -z "$with_mule" && with_mule=no
-if test "$enable_default_eol_detection" = "yes"; then
+if test "$with_default_eol_detection" = "yes"; then
 $as_echo "#define HAVE_DEFAULT_EOL_DETECTION 1" >>confdefs.h
 fi
 canna_libs=
 wnn_libs=
-if test "$enable_mule" = "yes" ; then
+if test "$with_mule" = "yes" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mule-related features" >&5
 $as_echo_n "checking for Mule-related features... " >&6; }
 $as_echo "#define MULE 1" >>confdefs.h
 :
 else
 with_xfs=no
 fi
-if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then
+if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then
 $as_echo "#define USE_XFONTSET 1" >>confdefs.h
 if test "$with_xim" = "no" ; then
 extra_objs="$extra_objs input-method-xlib.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"input-method-xlib.o\""
 fi
 fi
 fi
+case "$opsys" in
+*cygwin* ) for ac_func in cygwin_conv_path
+do :
+ac_fn_c_check_func "$LINENO" "cygwin_conv_path" "ac_cv_func_cygwin_conv_path"
+if test "x$ac_cv_func_cygwin_conv_path" = x""yes; then :
+cat >>confdefs.h <<_ACEOF
+#define HAVE_CYGWIN_CONV_PATH 1
+_ACEOF
+fi
+done
+	 ;;
+esac
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sound support" >&5
 $as_echo_n "checking for sound support... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-test -n "$with_native_sound_lib" && enable_sound_native=yes
+test -n "$with_native_sound_lib" && with_sound_native=yes
-if test "$enable_sound_native" != "no"; then
+if test "$with_sound_native" != "no"; then
 if test -n "$with_native_sound_lib"; then
 ac_fn_c_check_header_mongrel "$LINENO" "multimedia/audio_device.h" "ac_cv_header_multimedia_audio_device_h" "$ac_includes_default"
 if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then :
 sound_found=yes sound_cflags=""
 extra_objs="$extra_objs sunplay.o" &&  if test "$verbose" = "yes"; then
 fi
 fi
 if test "$sound_found" = "yes"; then
-enable_sound_native=yes
+with_sound_native=yes
 else
-if test "$enable_sound_native" = "yes" ; then
+if test "$with_sound_native" = "yes" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No native libraries found.  Disabling native sound support." >&5
 $as_echo "$as_me: WARNING: No native libraries found.  Disabling native sound support." >&2;}
 fi
-enable_sound_native=no
+with_sound_native=no
 fi
 fi
-if test "$enable_sound_native" = "yes"; then
+if test "$with_sound_native" = "yes"; then
 $as_echo "#define HAVE_NATIVE_SOUND 1" >>confdefs.h
 test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
 fi
-if test "$enable_sound_alsa" != "no"; then
+if test "$with_sound_alsa" != "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "alsa/input.h" "ac_cv_header_alsa_input_h" "$ac_includes_default"
 if test "x$ac_cv_header_alsa_input_h" = x""yes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 fi
 if test "$have_alsa_sound" = "yes"; then
-enable_sound_alsa=yes
+with_sound_alsa=yes
 $as_echo "#define HAVE_ALSA_SOUND 1" >>confdefs.h
 extra_objs="$extra_objs alsaplay.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"alsaplay.o\""
 fi
 LIBS="-lasound $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lasound\" to \$LIBS"; fi
 else
-test "$enable_sound_alsa" = "yes" && \
+test "$with_sound_alsa" = "yes" && \
 { echo "Error:" "Required ALSA sound support cannot be provided." >&2; exit 1; }
-enable_sound_alsa=no
+with_sound_alsa=no
 fi
 fi
-if test "$enable_sound_nas" != "no"; then
+if test "$with_sound_nas" != "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
 if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuOpenServer in -laudio" >&5
 $as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
 fi
 if test "$have_nas_sound" = "yes"; then
-enable_sound_nas=yes
+with_sound_nas=yes
 $as_echo "#define HAVE_NAS_SOUND 1" >>confdefs.h
 extra_objs="$extra_objs nas.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"nas.o\""
 fi
 fi
 rm -f conftest*
 else
-test "$enable_sound_nas" = "yes" && \
+test "$with_sound_nas" = "yes" && \
 { echo "Error:" "Required NAS sound support cannot be provided." >&2; exit 1; }
-enable_sound_nas=no
+with_sound_nas=no
 fi
 fi
-if test "$enable_sound_esd" != "no"; then
+if test "$with_sound_esd" != "no"; then
 # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_have_esd_config+set}" = set; then :
 fi
 fi
 if test "$have_esd_sound" = "yes"; then
-enable_sound_esd=yes
+with_sound_esd=yes
 need_miscplay=yes
 extra_objs="$extra_objs esd.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"esd.o\""
 fi
 $as_echo "#define HAVE_ESD_SOUND 1" >>confdefs.h
 else
-test "$enable_sound_esd" = "yes" && \
+test "$with_sound_esd" = "yes" && \
 { echo "Error:" "Required ESD sound support cannot be provided." >&2; exit 1; }
-enable_sound_esd=no
+with_sound_esd=no
 fi
 fi
 test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"miscplay.o\""
 fi
 eval "with_${feature}=no"
 done
 fi
-test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
+test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no" && { $as_echo "$as_me:${as_lineno-$LINENO}: checking for database support" >&5
 $as_echo_n "checking for database support... " >&6; } && \
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
+if test "$with_database_gdbm $with_database_dbm" != "no no"; then
 ndbm_h_file=""
 for ac_header in ndbm.h gdbm/ndbm.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 fi
 done
 if test "x$ndbm_h_file" = "x"; then
-test "$enable_database_gdbm" = "yes" -o \
+test "$with_database_gdbm" = "yes" -o \
-"$enable_database_dbm"  = "yes" && \
+"$with_database_dbm"  = "yes" && \
 { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
-enable_database_gdbm=no enable_database_dbm=no]
+with_database_gdbm=no with_database_dbm=no]
 fi
 fi
-if test "$enable_database_gdbm" != "no"; then
+if test "$with_database_gdbm" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm" >&5
 $as_echo_n "checking for dbm_open in -lgdbm... " >&6; }
 if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then :
 $as_echo_n "(cached) " >&6
 else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_dbm_open" >&6; }
 if test "x$ac_cv_lib_gdbm_dbm_open" = x""yes; then :
-enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm
+with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
 $as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
 if test "${ac_cv_lib_gdbm_compat_dbm_open+set}" = set; then :
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
 if test "x$ac_cv_lib_gdbm_compat_dbm_open" = x""yes; then :
-enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
+with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
 else
-if test "$enable_database_gdbm" = "yes"; then
+if test "$with_database_gdbm" = "yes"; then
 { echo "Error:" "Required GNU DBM support cannot be provided." >&2; exit 1; }
 fi
-enable_database_gdbm=no
+with_database_gdbm=no
 fi
 fi
 fi
-if test "$enable_database_dbm" != "no"; then
+if test "$with_database_dbm" != "no"; then
 ac_fn_c_check_func "$LINENO" "dbm_open" "ac_cv_func_dbm_open"
 if test "x$ac_cv_func_dbm_open" = x""yes; then :
-enable_database_dbm=yes libdbm=
+with_database_dbm=yes libdbm=
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -ldbm" >&5
 $as_echo_n "checking for dbm_open in -ldbm... " >&6; }
 if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then :
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
 if test "x$ac_cv_lib_dbm_dbm_open" = x""yes; then :
-enable_database_dbm=yes libdbm=-ldbm
+with_database_dbm=yes libdbm=-ldbm
 else
-test "$enable_database_dbm" = "yes" && \
+test "$with_database_dbm" = "yes" && \
 { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
-enable_database_dbm=no
+with_database_dbm=no
 fi
 fi
 fi
 test -n "$libdbm" && LIBS=""$libdbm" $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \""$libdbm"\" to \$LIBS"; fi
-if test "$enable_database_gdbm" = "yes" -o \
+if test "$with_database_gdbm" = "yes" -o \
-"$enable_database_dbm"  = "yes"; then
+"$with_database_dbm"  = "yes"; then
 cat >>confdefs.h <<_ACEOF
 #define NDBM_H_FILE "$ndbm_h_file"
 _ACEOF
 $as_echo "#define HAVE_DBM 1" >>confdefs.h
+if test "$XEMACS_CC_GPP" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -z "$CXX"; then
+if test -n "$CCC"; then
+CXX=$CCC
+else
+if test -n "$ac_tool_prefix"; then
+for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+$as_echo_n "(cached) " >&6
+else
+if test -n "$CXX"; then
+ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+IFS=$as_save_IFS
+test -z "$as_dir" && as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+break 2
+fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -n "$CXX" && break
+done
+fi
+if test -z "$CXX"; then
+ac_ct_CXX=$CXX
+for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+$as_echo_n "(cached) " >&6
+else
+if test -n "$ac_ct_CXX"; then
+ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+IFS=$as_save_IFS
+test -z "$as_dir" && as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ac_cv_prog_ac_ct_CXX="$ac_prog"
+$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+break 2
+fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -n "$ac_ct_CXX" && break
+done
+if test "x$ac_ct_CXX" = x; then
+CXX="g++"
+else
+case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+CXX=$ac_ct_CXX
+fi
+fi
+fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+{ { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+*) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+(eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ac_status=$?
+if test -s conftest.err; then
+sed '10a\
+... rest of stderr output deleted ...
+10q' conftest.err >conftest.er1
+cat conftest.er1 >&5
+fi
+rm -f conftest.er1 conftest.err
+$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+test $ac_status = 0; }
+done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+$as_echo_n "(cached) " >&6
+else
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+#ifndef __GNUC__
+choke me
+#endif
+;
+return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ac_compiler_gnu=yes
+else
+ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+GXX=yes
+else
+GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+$as_echo_n "(cached) " >&6
+else
+ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ac_cxx_werror_flag=yes
+ac_cv_prog_cxx_g=no
+CXXFLAGS="-g"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+;
+return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ac_cv_prog_cxx_g=yes
+else
+CXXFLAGS=""
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+;
+return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+else
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int
+main ()
+{
+;
+return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+if test "$GXX" = yes; then
+CXXFLAGS="-g -O2"
+else
+CXXFLAGS="-g"
+fi
+else
+if test "$GXX" = yes; then
+CXXFLAGS="-O2"
+else
+CXXFLAGS=
+fi
+fi
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$XEMACS_CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$XEMACS_CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "$ndbm_h_file"
+int
+main ()
+{
+dbm_close((DBM *) 0);
+;
+return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ndbm.h is compatible with g++" >&5
+$as_echo_n "checking whether ndbm.h is compatible with g++... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+$as_echo "#define TRUST_NDBM_H_PROTOTYPES 1" >>confdefs.h
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ndbm.h is compatible with g++" >&5
+$as_echo_n "checking whether ndbm.h is compatible with g++... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+else
+$as_echo "#define TRUST_NDBM_H_PROTOTYPES 1" >>confdefs.h
+fi
 $as_unset ndbm_h_file
 fi
 ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default"
 if test "x$ac_cv_type_u_int8_t" = x""yes; then :
 fi
-if test "$enable_database_berkdb" != "no"; then
+if test "$with_database_berkdb" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley db.h" >&5
 $as_echo_n "checking for Berkeley db.h... " >&6; }
 for header in "db/db.h" "db.h"; do
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 if test -z "$db_h_file"
 then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; enable_database_berkdb=no
+$as_echo "no" >&6; }; with_database_berkdb=no
 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_h_file" >&5
 $as_echo "$db_h_file" >&6; }
 fi
-if test "$enable_database_berkdb" != "no"; then
+if test "$with_database_berkdb" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version" >&5
 $as_echo_n "checking for Berkeley DB version... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$db_h_file>
 as_ac_var=`$as_echo "ac_cv_func_$dbfunc" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$dbfunc" "$as_ac_var"
 eval as_val=\$$as_ac_var
 if test "x$as_val" = x""yes; then :
-enable_database_berkdb=yes need_libdb=no
+with_database_berkdb=yes need_libdb=no
 else
 as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
 $as_echo_n "checking for $dbfunc in -ldb... " >&6; }
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 eval as_val=\$$as_ac_Lib
 if test "x$as_val" = x""yes; then :
-enable_database_berkdb=yes need_libdb=yes
+with_database_berkdb=yes need_libdb=yes
 fi
 fi
 fi
-if test "$enable_database_berkdb" = "yes" -a "$dbver" = "4"; then
+if test "$with_database_berkdb" = "yes" -a "$dbver" = "4"; then
 rm -f $tempcname
 echo "#include <$db_h_file>" > $tempcname
 echo "configure___ dbfunc=db_create" >> $tempcname
 eval `$CPP -Isrc $tempcname \
 	| sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 eval as_val=\$$as_ac_Lib
 if test "x$as_val" = x""yes; then :
-enable_database_berkdb=yes need_libdb=yes
+with_database_berkdb=yes need_libdb=yes
 fi
 fi
-if test "$enable_database_berkdb" = "yes"; then
+if test "$with_database_berkdb" = "yes"; then
 cat >>confdefs.h <<_ACEOF
 #define DB_H_FILE "$db_h_file"
 _ACEOF
 $as_echo "#define HAVE_BERKELEY_DB 1" >>confdefs.h
 test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-ldb\" to \$LIBS"; fi
-else enable_database_berkdb=no
+else with_database_berkdb=no
 fi
 fi
-if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
+if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no"; then
 $as_echo "#define HAVE_DATABASE 1" >>confdefs.h
 fi
 $as_echo "#define USAGE_TRACKING 1" >>confdefs.h
 LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
-if test "$enable_bignum" = "gmp"; then
+if test "$with_bignum" = "gmp"; then
 ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
 if test "x$ac_cv_header_gmp_h" = x""yes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
 $as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
 LIBS="-lgmp $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgmp\" to \$LIBS"; fi
 else
 { echo "Error:" "Required GMP numeric support cannot be provided." >&2; exit 1; }
 fi
-elif test "$enable_bignum" = "mp"; then
+elif test "$with_bignum" = "mp"; then
 for library in "" "-lcrypto"; do
 ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default"
 if test "x$ac_cv_header_mp_h" = x""yes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mfree in -lmp" >&5
 $as_echo "#define HAVE_UNIX_PROCESSES 1" >>confdefs.h
 fi
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 ld_libs_module=
 else
 T=""
 for W in $ldap_libs $postgresql_libs $canna_libs; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 T=""
 for W in $ld_libs_window_system $ld_libs_general $ld_libs_module; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 ld_libs_all="$T"
-if test "$enable_modules" = "no"; then
+if test "$with_modules" = "no"; then
 MAKE_SUBDIR="$MAKE_SUBDIR src" &&  if test "$verbose" = "yes"; then echo "    Appending \"src\" to \$MAKE_SUBDIR"; fi
 fi
-internal_makefile_list="Makefile.in"
+internal_makefile_list="Makefile.in src/.gdbinit.in"
 SUBDIR_MAKEFILES=''
 test -d lock || mkdir lock
 for dir in $MAKE_SUBDIR; do
 case "$dir" in */* )     ( for d in `echo $dir | sed 's:/: :g'` ; do
 test -d "$d" || mkdir "$d"; cd "$d"
 for var in extra_objs    c_switch_general  c_switch_window_system  c_switch_all   ld_switch_general ld_switch_window_system ld_switch_all     ld_libs_general   ld_libs_window_system   ld_libs_all; do eval "echo \"$var = '\$$var'\""; done
 echo ""
 fi
-if test -f "$srcdir/etc/gdbinit.in"; then
-test "$verbose" = "yes" && echo "creating src/.gdbinit.in"
-cp $srcdir/etc/gdbinit.in src/.gdbinit.in
-fi
 if test -f "$srcdir/etc/dbxrc.in"; then
 test "$verbose" = "yes" && echo "creating src/.dbxrc.in"
 echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in"
 fi
 elif test "$with_debug_malloc"  = "yes"; then $as_echo "#define USE_DEBUG_MALLOC 1" >>confdefs.h
 					      $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h
 fi
-test "$GCC"                = "yes" && $as_echo "#define USE_GCC 1" >>confdefs.h
+test "$GCC"                  = "yes" && $as_echo "#define USE_GCC 1" >>confdefs.h
-test "$enable_external_widget" = "yes" && $as_echo "#define EXTERNAL_WIDGET 1" >>confdefs.h
+test "$XEMACS_CC_GPP"        = "yes" && $as_echo "#define USE_GPLUSPLUS 1" >>confdefs.h
-test "$enable_kkcc"        = "yes" && $as_echo "#define USE_KKCC 1" >>confdefs.h
+test "$with_external_widget" = "yes" && $as_echo "#define EXTERNAL_WIDGET 1" >>confdefs.h
-test "$enable_newgc"       = "yes" && $as_echo "#define NEW_GC 1" >>confdefs.h
+test "$with_kkcc"            = "yes" && $as_echo "#define USE_KKCC 1" >>confdefs.h
-test "$have_vdb_posix"     = "yes" && $as_echo "#define VDB_POSIX 1" >>confdefs.h
+test "$with_newgc"           = "yes" && $as_echo "#define NEW_GC 1" >>confdefs.h
-test "$have_vdb_fake"      = "yes" && $as_echo "#define VDB_FAKE 1" >>confdefs.h
+test "$have_vdb_posix"       = "yes" && $as_echo "#define VDB_POSIX 1" >>confdefs.h
-test "$enable_quick_build" = "yes" && $as_echo "#define QUICK_BUILD 1" >>confdefs.h
+test "$have_vdb_fake"        = "yes" && $as_echo "#define VDB_FAKE 1" >>confdefs.h
-test "$with_purify"        = "yes" && $as_echo "#define PURIFY 1" >>confdefs.h
+test "$with_quick_build"     = "yes" && $as_echo "#define QUICK_BUILD 1" >>confdefs.h
-test "$with_quantify"      = "yes" && $as_echo "#define QUANTIFY 1" >>confdefs.h
+test "$with_purify"          = "yes" && $as_echo "#define PURIFY 1" >>confdefs.h
-test "$with_pop"           = "yes" && $as_echo "#define MAIL_USE_POP 1" >>confdefs.h
+test "$with_quantify"        = "yes" && $as_echo "#define QUANTIFY 1" >>confdefs.h
-test "$with_kerberos"      = "yes" && $as_echo "#define KERBEROS 1" >>confdefs.h
+test "$with_valgrind"        = "yes" && $as_echo "#define USE_VALGRIND 1" >>confdefs.h
-test "$with_hesiod"        = "yes" && $as_echo "#define HESIOD 1" >>confdefs.h
+test "$with_pop"             = "yes" && $as_echo "#define MAIL_USE_POP 1" >>confdefs.h
-test "$enable_union_type"  = "yes" && $as_echo "#define USE_UNION_TYPE 1" >>confdefs.h
+test "$with_kerberos"        = "yes" && $as_echo "#define KERBEROS 1" >>confdefs.h
-test "$enable_pdump"       = "yes" && $as_echo "#define PDUMP 1" >>confdefs.h
+test "$with_hesiod"          = "yes" && $as_echo "#define HESIOD 1" >>confdefs.h
-test "$enable_dump_in_exec" = "yes" && $as_echo "#define DUMP_IN_EXEC 1" >>confdefs.h
+test "$with_union_type"      = "yes" && $as_echo "#define USE_UNION_TYPE 1" >>confdefs.h
-test "$with_ipv6_cname"    = "yes" && $as_echo "#define IPV6_CANONICALIZE 1" >>confdefs.h
+test "$with_pdump"           = "yes" && $as_echo "#define PDUMP 1" >>confdefs.h
+test "$with_dump_in_exec"    = "yes" && $as_echo "#define DUMP_IN_EXEC 1" >>confdefs.h
+test "$with_ipv6_cname"      = "yes" && $as_echo "#define IPV6_CANONICALIZE 1" >>confdefs.h
 echo "  libc version:                      $libc_version"
 echo "  Relocating allocator for buffers:  $with_rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
 case "$ld_switch_site" in
 *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
-- Consider configuring with --enable-pdump." ;;
+- Consider configuring with --with-pdump." ;;
 esac
 echo "
 Window System:"
 if test "$with_msw" = "yes"; then
 if test "$need_athena" = "yes"; then
 echo "  Compiling in support for the Athena widget set:"
 echo "    - Athena headers location:                    $athena_h_path"
 echo "    - Athena library to link:                     $athena_lib"
 fi
-case "$enable_menubars" in
+case "$with_menubars" in
 gtk   ) echo "  Using GTK menubars."   ;;
 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."
-echo "             Re-run configure with --enable-menubars='lucid'." ;;
+echo "             Re-run configure with --with-menubars='lucid'." ;;
 msw ) echo "  Using MS-Windows menubars." ;;
 esac
 if test "$with_xft_menubars" = "yes"; then
 echo "    - Using Xft to render antialiased fonts in menubars."
-echo "      WARNING: This feature will be replaced with a face."
+echo "      WARNING: This Xft feature will be replaced with a face."
 fi
-case "$enable_scrollbars" in
+case "$with_scrollbars" in
 gtk    ) echo "  Using GTK scrollbars."        ;;
 lucid  ) echo "  Using Lucid scrollbars."      ;;
 motif  ) echo "  Using Motif scrollbars."      ;;
 athena ) echo "  Using Athena scrollbars."     ;;
 msw ) echo "  Using MS-Windows scrollbars." ;;
 esac
-case "$enable_dialogs" in
+case "$with_dialogs" in
 gtk    ) echo "  Using GTK dialog boxes." ;;
 motif  ) echo "  Using Motif dialog boxes."
 if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
 echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
 echo "             We recommend using the Athena dialog boxes instead."
-echo "             Install libXaw and re-run configure with --enable-dialogs='athena'."
+echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
 echo "             Read the PROBLEMS file for more information."
 fi; fi ;;
 athena ) echo "  Using Athena dialog boxes."     ;;
 msw ) echo "  Using MS-Windows dialog boxes." ;;
 esac
-case "$enable_widgets" in
+case "$with_widgets" in
 gtk    ) echo "  Using GTK native widgets."        ;;
 motif  ) echo "  Using Motif native widgets."      ;;
 athena ) echo "  Using Athena native widgets."     ;;
 msw ) echo "  Using MS-Windows native widgets." ;;
 esac
 if test "$with_xft_tabs" = "yes"; then
 echo "    - Using Xft to render antialiased fonts in tab controls."
-echo "      WARNING: This feature will be replaced with a face."
+echo "      WARNING: This Xft feature will be replaced with a face."
 fi
 if test "$with_xft_gauges" = "yes"; then
 echo "    - Using Xft to render antialiased fonts in progress bars."
-echo "      WARNING: This feature will be replaced with a face."
+echo "      WARNING: This Xft feature will be replaced with a face."
-echo "      WARNING: This feature not yet implemented; setting ignored."
+echo "      WARNING: This Xft feature not yet implemented; setting ignored."
 fi
 if test "$with_dragndrop" = yes; then
 echo "  Compiling in support for Drag'n'Drop (EXPERIMENTAL)."
 echo "    -  Drag'n'Drop prototype:                             $dragndrop_proto."
 fi
 test "$with_tiff" = yes && echo "  Compiling in support for TIFF images."
 test "$with_xface" = yes && echo "  Compiling in support for X-Face message headers."
 echo "
 Sound:"
-test "$enable_sound_native" = yes && echo "  Compiling in support for sound (native)."
+test "$with_sound_native" = yes && echo "  Compiling in support for sound (native)."
-test "$enable_sound_alsa" = yes && echo "  Compiling in support for ALSA (Advanced Linux Sound Architecture)."
+test "$with_sound_alsa" = yes && echo "  Compiling in support for ALSA (Advanced Linux Sound Architecture)."
-test "$enable_sound_nas" = yes && echo "  Compiling in support for NAS (network audio system)."
+test "$with_sound_nas" = yes && echo "  Compiling in support for NAS (network audio system)."
 test "$old_nas" = yes && echo "    - NAS library lacks error trapping; will play synchronously."
-test "$enable_sound_esd" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
+test "$with_sound_esd" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
 echo "
 Databases:"
-test "$enable_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
+test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
-test "$enable_database_dbm"    = yes && echo "  Compiling in support for DBM."
+test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
-test "$enable_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
+test "$with_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
 test "$with_ldap" = yes && echo "  Compiling in support for LDAP."
 if test "$with_postgresql" = yes; then
 echo "  Compiling in support for PostgreSQL."
 echo "    - Using PostgreSQL header file:  $libpq_fe_h_file"
 test "$with_postgresqlv7" = yes && echo "    - Using PostgreSQL V7 bindings."
 fi
 echo "
 Internationalization:"
-test "$enable_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
+test "$with_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
 test "$with_xim" != no && echo "  Compiling in support for XIM (X11R5+ I18N input method)."
 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_xfs" = yes && echo "    - Using XFontSet to provide bilingual menubar."
 test "$have_canna" = yes && echo "  Compiling in support for Canna on Mule."
 test "$with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
 test "$with_dnet" = yes && echo "  Compiling in support for DNET."
-test "$enable_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
+test "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
-test "$enable_bignum" = "gmp" && echo "  Compiling in support for more number types using the GNU MP library."
+test "$with_bignum" = "gmp" && echo "  Compiling in support for more number types using the GNU MP library."
-test "$enable_bignum" = "mp" && echo "  Compiling in support for more number types using the BSD MP library."
+test "$with_bignum" = "mp" && echo "  Compiling in support for more number types using the BSD MP library."
-if test "$enable_union_type" = yes ; then
+if test "$with_union_type" = yes ; then
 echo "  Using the union type for Lisp_Objects."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: This tends to trigger compiler bugs, especially when"
 echo "  WARNING: combined with MULE and ERROR_CHECKING.  Crashes have"
 echo "  WARNING: been seen with various versions of GCC (up to about 2.95),"
 echo "  WARNING: and recently with Visual C++ as well (mid-2003)."
 echo "  WARNING: More recent versions may be safer, or not."
 echo "  WARNING: ---------------------------------------------------------"
 fi
-if test "$enable_kkcc" = yes ; then
+if test "$with_kkcc" = yes ; then
 echo "  Using the new GC mark algorithms (KKCC)."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: The new algorithms are experimental. They are enabled by"
 echo "  WARNING: default for this release. Use \`--disable-kkcc' to"
 echo "  WARNING: turn it off."
 echo "  WARNING: ---------------------------------------------------------"
 fi
-test "$enable_newgc" = yes && echo "  Using the new incremental garbage collector and the new allocator."
+test "$with_newgc" = yes && echo "  Using the new incremental garbage collector and the new allocator."
 if test "$have_vdb_posix" = yes ; then
 if test "$have_vdb_sigaction" = yes ; then
 echo "  Using POSIX sigaction() to install fault handler."
 else
 echo "  Using POSIX signal() to install vdb fault handler."
 echo "  Using special WIN32 vdb fault handler."
 fi
 if test "$have_vdb_mach" = yes ; then
 echo "  Using mach exception mechanism as vdb fault handler."
 fi
-if test "$have_vdb_fake" = yes && test "$enable_vdb" == fake; then
+if test "$have_vdb_fake" = yes && test "$with_vdb" == fake; then
 echo "  Virtual dirty bit write barrier manually disabled."
 fi
-test "$enable_pdump" = yes && echo "  Using the new portable dumper."
+test "$with_pdump" = yes && echo "  Using the new portable dumper."
-test "$enable_dump_in_exec" = yes && echo "  Dumping into executable."
+test "$with_dump_in_exec" = yes && echo "  Dumping into executable."
-test "$enable_debug" = yes && echo "  Compiling in support for extra debugging code."
+test "$with_debug" = yes && echo "  Compiling in support for extra debugging code."
 test "$usage_tracking" = yes && echo "  Compiling in support for active usage tracking (Sun internal)."
-if test "$enable_error_checking_extents $enable_error_checking_types $enable_error_checking_text $enable_error_checking_gc $enable_error_checking_malloc $enable_error_checking_glyphs $enable_error_checking_byte_code $enable_error_checking_display $enable_error_checking_structures" \
+if test "$with_error_checking_extents $with_error_checking_types $with_error_checking_text $with_error_checking_gc $with_error_checking_malloc $with_error_checking_glyphs $with_error_checking_byte_code $with_error_checking_display $with_error_checking_structures" \
 != "no no no no no no no no no"; then
 echo "  Compiling in support for runtime error checking."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: XEmacs will run noticeably more slowly as a result."
 echo "  WARNING: Error checking is on by default for XEmacs beta releases."
 echo "  WARNING: ---------------------------------------------------------"
 fi
+test "$with_valgrind" = yes && echo "  Compiling in support for memory debugging with Valgrind."
 echo ""
 ) | tee -a Installation
 echo ""
 ac_config_headers="$ac_config_headers src/config.h lwlib/config.h"
 ac_config_files="$ac_config_files $file"
 done
 ac_config_files="$ac_config_files src/paths.h src/xemacs.def.in lib-src/config.values"
-test "$enable_modules" = "yes" && ac_config_files="$ac_config_files lib-src/ellcc.h"
+test "$with_modules" = "yes" && ac_config_files="$ac_config_files lib-src/ellcc.h"
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 CONFIG_FILES    = $CONFIG_FILES
 CONFIG_HEADERS  = $CONFIG_HEADERS
 CONFIG_LINKS    = $CONFIG_LINKS
 CONFIG_COMMANDS = $CONFIG_COMMANDS
 Usage: $0 [OPTION]... [TAG]...
 -h, --help       print this help, then exit
 -V, --version    print version number and configuration settings, then exit
+--config     print configuration, then exit
 -q, --quiet, --silent
 do not print progress messages
 -d, --debug      don't remove temporary files
 --recheck    update $as_me by reconfiguring in the same conditions
 --file=FILE[:TEMPLATE]
 Report bugs to <xemacs-beta@xemacs.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.64,
+configured by $0, generated by GNU Autoconf 2.65,
-with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+with options \\"\$ac_cs_config\\"
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 # Handling of the options.
 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 ac_cs_recheck=: ;;
 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 $as_echo "$ac_cs_version"; exit ;;
+--config | --confi | --conf | --con | --co | --c )
+$as_echo "$ac_cs_config"; exit ;;
 --debug | --debu | --deb | --de | --d | -d )
 debug=: ;;
 --file | --fil | --fi | --f )
 $ac_shift
 case $ac_optarg in
 t repl
 s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
 n
 b repl
 g
 s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
 b
 :more2

Mercurial > hg > xemacs-beta

comparison configure @ 5125:b5df3737028a ben-lisp-object