xemacs-beta: configure.in comparison

comparison configure.in @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	576fb035e263

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 ### Don't edit this script!
 ### This script was automatically generated by the `autoconf' program
 ### from the file `./configure.in'.
 ### To rebuild it, execute the command
 ###	autoconf
-### in the this directory.  You must have autoconf version 2.12 or later.
+### in the this directory.  You must have autoconf version 2.13 or later.
 ### This file is part of XEmacs.
 ### XEmacs is free software; you can redistribute it and/or modify it
 ### under the terms of the GNU General Public License as published by
 dnl configuration code and autoconf macros.
 dnl We use the m4 quoting characters [ ] (as established by the
 dnl autoconf system), so quote them like this: [[foo]]
-AC_PREREQ(2.12)dnl
+AC_PREREQ(2.13)dnl
 dnl Redefine some standard autoconf macros
 dnl here is how XEmacs is different:
 dnl - no cache file
 dnl - non-standard options
 dnl - suport for extra-verbosity
 mandir='${prefix}/man'
 dnl Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 dnl Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 ])dnl AC_INIT_PARSE_ARGS
 AC_INIT(src/lisp.h)dnl
 sitelispdir='${datadir}/${inststaticdir}/site-lisp'
 sitemoduledir='${datadir}/${inststaticdir}/site-modules'
 pkgdir='${datadir}/${instvardir}/lisp'
 package_path=''
 etcdir='${datadir}/${instvardir}/etc'
-lockdir='${statedir}/${inststaticdir}/lock'
 archlibdir='${datadir}/${instvardir}/${configuration}'
 docdir='${archlibdir}'
 with_prefix='yes'
 with_site_lisp='no'
 with_site_modules='yes'
 with_menubars=''
 with_scrollbars=''
 with_widgets=''
 with_dialogs=''
 with_file_coding=''
-dnl const_is_losing is removed - we rely on AC_C_CONST instead.
-dnl We accept (and ignore) the --const-is-losing option for compatibility.
-dnl const_is_losing='yes'
 cpp='' cppflags='' libs='' ldflags=''
 dynamic=''
 with_x11=''
 with_msw=''
 rel_alloc='default'
 	with_wnn6	| \
 	with_workshop	| \
 	with_sparcworks | \
 	with_tooltalk	| \
 	with_ldap	| \
+	with_postgresql	| \
 	with_pop	| \
 	with_kerberos	| \
 	with_hesiod	| \
 	with_dnet	| \
 	with_infodock	| \
 	external_widget | \
 	verbose		| \
 	extra_verbose	| \
-	const_is_losing | \
 	usage_tracking	| \
 	use_union_type	| \
 	pdump		| \
 	debug		| \
 	use_assertions	| \
 	memory_usage_stats | \
 	with_clash_detection | \
 	with_modules | \
-	no_doc_file )
+	quick_build )
 	  dnl Make sure the value given was either "yes" or "no".
 	  case "$val" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no	;;
 	    * ) USAGE_ERROR("The \`--$optname' option requires a boolean value: \`yes' or \`no'.") ;;
 	    fi
 	    sound_notfirst=true
 	  done
 ;;
-dnl Has the user specified a prefered Athena widget set?
+dnl Has the user specified a preferred Athena widget set?
 dnl This bit expands any alias names out for us...
 "with_athena" )
 	  case "$val" in
 xa | xaw )			  val=xaw    ;;
 3 | 3d | xaw3d )              val=3d     ;;
 	      nomalloc )      error_check_malloc=no ;;
 	      byte_code )     error_check_byte_code=yes ;;
 	      nobyte_code )   error_check_byte_code=no ;;
+	      glyphs )     error_check_glyphs=yes ;;
+	      noglyphs )   error_check_glyphs=no ;;
 	      * ) bogus_error_check=yes ;;
 	    esac
 	    if test "$bogus_error_check" -o \
 	         \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
 		if test "$error_check_default" = yes ; then
-		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', and \`nobyte-code'."
+		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', \`noglyphs' and \`nobyte-code'."
 		else
-		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', and \`byte-code'."
+		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', \`glyphs' and \`byte-code'."
 		fi
 		USAGE_ERROR(["Valid types for the \`--$optname' option are:
 $types."])
 	    elif test -n "$new_default" ; then
 		error_check_extents=$new_default
 		error_check_typecheck=$new_default
 		error_check_bufpos=$new_default
 		error_check_gc=$new_default
 		error_check_malloc=$new_default
 		error_check_byte_code=$new_default
+		error_check_glyphs=$new_default
 		new_default=	# reset this
 	    fi
 	    echeck_notfirst=true
 	  done
 	;;
 	dnl testers, at large sites, have said they have their X files
 	dnl installed in odd places.
 	dnl Has the user specified one of the path options?
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
-	mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \
+	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
 	archlibdir | docdir | package_path )
 	   dnl If the value was omitted, get it from the next argument.
 	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 USAGE_ERROR("The \`--$optname' option requires a value.");
 datadir )
 	        AC_DEFINE(INFODIR_USER_DEFINED)
 	        AC_DEFINE(LISPDIR_USER_DEFINED)
 AC_DEFINE(MODULEDIR_USER_DEFINED)
 	        AC_DEFINE(ETCDIR_USER_DEFINED) ;;
-statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;;
 	     docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;;
 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;;
 esac
 	;;
 	"usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;;
 	dnl Has the user specified the toolkit(s) to use for GUI elements?
 	"with_menubars"   | \
 	"with_scrollbars" | \
-	"with_dialogs" | \
+	"with_dialogs"    | \
 	"with_widgets" )
 	  case "$val" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
-	    n | no | non | none )			val=no ;;
+	    n | no | non | none )			val=no     ;;
+	    y | ye | yes )				val=yes    ;;
 	    * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
-\`lucid', \`motif', \`athena', or \`no'."]) ;;
+\`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
 	  esac
 	  eval "$opt=\"$val\""
 	;;
 	dnl Obsolete legacy argument?  Warn, but otherwise ignore.
 	"use_minimal_tagbits" | \
 	"use_indexed_lrecord_implementation" | \
 	"run_in_place"	| \
+	"const_is_losing" | \
 	"with_gnu_make" )
 	  AC_MSG_WARN([Obsolete option \`--$optname' ignored.])
 	;;
 dnl Unrecognized option?  No mercy for user errors.
 CPPFLAGS="$CPPFLAGS -DINFODOCK"
 else
 PROGNAME=xemacs
 fi
+AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME")
 dnl ----------------------------------
 dnl Error checking and debugging flags
 dnl ----------------------------------
 dnl Error checking default to "yes" in beta versions, to "no" in releases.
 dnl Same goes for --debug and --extra-verbosity.
 test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK)
 test "${error_check_bufpos=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_BUFPOS)
 test "${error_check_gc=$beta}"        = yes && AC_DEFINE(ERROR_CHECK_GC)
 test "${error_check_malloc=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
 test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
+test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
 dnl debug=yes must be set when error checking is present.  This should be
 dnl fixed up.
 dnl debug implies other options
 if test "${debug:=$beta}" = "yes"; then
 use_assertions=yes memory_usage_stats=yes
 hppa-*-*         ) machine=hp800 ;;
 m88k-dg-*        ) machine=aviion ;;
 m68*-sony-*      ) machine=news ;;
 mips-sony-*      ) machine=news-risc ;;
 clipper-*        ) machine=clipper ;;
-arm-*            ) machine=arm ;;
+arm*             ) machine=arm ;;
-armv[34][lb]-*   ) machine=arm ;;
 ns32k-*          ) machine=ns32000 ;;
 esac
 dnl Straightforward OS determination
 case "$canonical" in
 dnl Linux/68k
 m68k-*-linux* ) machine=m68k opsys=linux ;;
 esac
-if test -z "$machine" -o -z "$opsys"; then
+dnl Initialize machine and opsys from $canonical if not in our database above.
-(echo "$progname: XEmacs hasn't been ported to \`$canonical' systems."
+test -z "$machine" && machine=`echo $canonical | sed 's/-.*$//'`
-echo "$progname: Check \`etc/MACHINES' for recognized configuration names."
+test -z "$opsys"   && opsys=`echo $canonical | sed 's/^[^-]*-[^-]*-//'`
-) >&2
-exit 1
+dnl Use configure-time autodetection if s&m not available
-fi
+if test -r "${srcdir}/src/m/${machine}.h"; then
+machfile="m/${machine}.h"
+AC_DEFINE_UNQUOTED(config_machfile, "$machfile")
+else
+echo "XEmacs has no builtin knowledge of \`$machine' machines."
+echo "Using configure-time autodetection only."
+fi
+if test -r "${srcdir}/src/s/${opsys}.h"; then
+opsysfile="s/${opsys}.h"
+AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")
+else
+echo "XEmacs has no builtin knowledge of \`$opsys' operating systems."
+echo "Using configure-time autodetection only."
+fi
 if test -z "$dynamic"; then
 case "$opsys" in
 hpux* | sunos4* ) dynamic=no ;;
 *) dynamic=yes ;;
 case "$opsys" in aix*) NON_GNU_CC=xlc ;; esac
 stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${canonical} | sed 'y/.-/__/'`
 AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher)
-machfile="m/${machine}.h"
-opsysfile="s/${opsys}.h"
 dnl --------------------------------------------------
 dnl Determine the compiler, set up for feature testing
 dnl --------------------------------------------------
 dnl Sun Development environment support
 if test "$with_workshop" = "yes"; then
 AC_DEFINE(SUNPRO)
 XE_ADD_OBJS(sunpro.o)
 fi
-if test "$with_clash_detection" = "yes"; then
+if test "$with_clash_detection" != "no"; then
 AC_DEFINE(CLASH_DETECTION)
 XE_ADD_OBJS(filelock.o)
 fi
 dnl Choose a compiler from (in order)
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 AC_PROG_CPP
-AC_AIX
+dnl --------------------------------------------------------------------
+dnl Compiler feature macros
+dnl --------------------------------------------------------------------
+AC_AIX dnl Defines _ALL_SOURCE on AIX.
+dnl We want feature macros defined here *and* in config.h.in, so that
+dnl the compilation environment at configure time and compile time agree.
 AC_MSG_CHECKING(for GNU libc)
 AC_TRY_COMPILE([#include <features.h>],[
 #if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
 #error Not a GNU libc system :-(
 AC_MSG_RESULT($have_glibc)
 dnl I'm tired of pop being broken with GLIBC -slb
 dnl Well. then why not fix fucking pop?
 test "$have_glibc" = "yes" && AC_DEFINE(_GNU_SOURCE)
+dnl We'd like to use vendor extensions, where available.
+dnl We'd like to use functions from the latest Unix98 standards.
+dnl See http://www.opengroup.org/onlinepubs/007908799/xsh/compilation.html
+case "$opsys" in
+sol2)
+AC_DEFINE(__EXTENSIONS__)
+dnl Solaris 2 before 2.5 had some bugs with feature test macro interaction.
+if test "$os_release" -ge 55; then
+AC_DEFINE(_XOPEN_SOURCE,500)
+AC_DEFINE(_XOPEN_SOURCE_EXTENDED)
+fi ;;
+linux)
+AC_DEFINE(_POSIX_C_SOURCE,199506L)
+AC_DEFINE(_XOPEN_SOURCE,500)
+AC_DEFINE(_XOPEN_SOURCE_EXTENDED)
+;;
+esac
 dnl Identify compilers to enable compiler-specific hacks.
 dnl Add support for other compilers HERE!
 dnl GCC is already identified elsewhere.
 AC_TRY_RUN([int main () {
 #if defined __SUNPRO_C
 return 11;
 #elif defined __DECC
 return 12;
+#elif defined __USLC__ && defined __SCO_VERSION__
+return 13;
 #else
 return 0;
 #endif
 }], [],
 [case "$conftest_rc" in
 11) echo "You appear to be using the SunPro C compiler."; __SUNPRO_C=yes ;;
 12) echo "You appear to be using the DEC C compiler."   ; __DECC=yes ;;
+13) echo "You appear to be using the SCO C compiler."   ; __USLC__=yes ;;
 esac])
 dnl case "$canonical" in
 dnl   *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;;
 [#]else
 configure___ [$2]=no
 [#]endif
 ])dnl CPP_boolean_to_sh
-cat > $tempcname <<EOF
+cat > $tempcname < confdefs.h
+cat >> $tempcname <<EOF
 #define NOT_C_CODE
 #define C_SWITCH_SITE
 #define C_SWITCH_X_SITE
 #define LD_SWITCH_SITE
 #define LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE_AUX
 #define OS_RELEASE $os_release
+#ifdef config_opsysfile
 #include "$srcdir/src/$opsysfile"
+#endif
+#ifdef config_machfile
 #include "$srcdir/src/$machfile"
+#endif
 CPP_to_sh(LIBS_MACHINE, libs_machine)
 CPP_to_sh(LIBS_SYSTEM,  libs_system)
 CPP_to_sh(LIBS_TERMCAP, libs_termcap)
 CPP_to_sh(LIB_STANDARD, libs_standard)
 CPP_to_sh(UNEXEC, unexec, unexec.o)
 CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c)
+#define ORDINARY_LD "\$(CC) \$(CFLAGS)"
+configure___ ordinary_ld=ORDINARY_LD
 #ifdef ORDINARY_LINK
-#define LD "\$(CC) \$(CFLAGS)"
+#define LD ORDINARY_LD
 #else /* no ORDINARY LINK */
 #ifdef COFF_ENCAPSULATE
 #define LD "\$(CC) -nostdlib"
 #else /* not COFF_ENCAPSULATE */
 #ifdef LINKER
 	| sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
 changequote([, ])dnl
 rm $tempcname
+if test "$pdump" = "yes"; then
+ordinary_link="yes"
+ld="${ordinary_ld}"
+start_files=
+libs_standard=
+unexec=
+lib_gcc=
+fi
 dnl For debugging...
 test "$extra_verbose" = "yes" && \
 PRINT_VAR(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
 esac
 dnl Non-ordinary link usually requires -lc
 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
+dnl -----------------------
 dnl Compiler-specific hacks
-dnl DEC C requires -std
+dnl -----------------------
-test "$__DECC" = "yes" && XE_APPEND(-std, c_switch_site)
+dnl DEC C `-std1' means ANSI C mode
+test "$__DECC" = "yes" && XE_APPEND(-std1, c_switch_site)
+dnl Some versions of SCO native compiler need -Kalloca
+if test "$__USLC__" = yes; then
+AC_MSG_CHECKING(for whether the -Kalloca compiler flag is needed)
+need_kalloca=no
+AC_TRY_LINK([], [void *x = alloca(4);], [:], [
+xe_save_c_switch_system="$c_switch_system"
+c_switch_system="$c_switch_system -Kalloca"
+AC_TRY_LINK([], [void *x = alloca(4);], [ need_kalloca=yes ])
+c_switch_system="$xe_save_c_switch_system"])
+AC_MSG_RESULT($need_kalloca)
+test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system)
+fi
 dnl Calculalate value of CFLAGS:
 dnl Use either command line flag, environment var, or autodetection
 if test "$cflags_specified" = "no"; then
 dnl Following values of CFLAGS are known to work well.
 else
 CFLAGS="-O" ;dnl The only POSIX-approved flag
 fi
 fi
+dnl Search for GCC specific build problems we know about
+if test "$GCC" = "yes"; then
+AC_MSG_CHECKING(for buggy gcc versions)
+GCC_VERSION=`$CC --version`
+case `uname -s`:`uname -m`:$GCC_VERSION in
+	dnl egcs 2.90.21 (egcs-1.00 release)
+	dnl egcs 2.90.29 (egcs-1.0.3 release)
+*:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
+dnl Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures
+dnl without also using `-fno-schedule-insns'.
+case "$CFLAGS" in
+*-O2*|*-O3*)
+case "$CFLAGS" in
+*-fno-schedule-insns*) ;;
+*)
+AC_MSG_RESULT(yes)
+AC_MSG_WARN(Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures)
+AC_MSG_WARN(without also using -fno-schedule-insns.)
+AC_MSG_ERROR(Aborting due to known problem)
+;;
+esac
+;;
+esac
+;;
+	dnl egcs-2.91.57 (egcs-1.1 release)
+	dnl egcs-2.91.66 (egcs-1.1.2 release)
+Linux:alpha:egcs-2.91.*)
+AC_MSG_RESULT(yes)
+AC_MSG_WARN(There have been reports of egcs-1.1 not compiling XEmacs correctly on)
+AC_MSG_WARN(Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K.)
+AC_MSG_ERROR(Aborting due to known problem)
+;;
+*:i*86*:2.7.2*)
+	case "$GCC_VERSION" in
+	    2.7.2)
+		case "$CFLAGS" in
+	    *-O2*|*-O3*)
+	case "$CFLAGS" in
+	                    *-fno-strength-reduce*) ;;
+	            *)
+AC_MSG_RESULT(yes)
+	        AC_MSG_WARN(Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using)
+	                        AC_MSG_WARN(-fno-strength-reduce.)
+	                AC_MSG_ERROR(Aborting due to known problem)
+	                        ;;
+	                esac
+	                ;;
+		esac
+		;;
+	esac
+case "$CFLAGS" in
+	 *-fno-caller-saves*) ;;
+	 *)
+AC_MSG_RESULT(yes)
+	    AC_MSG_WARN(Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using)
+	    AC_MSG_WARN(-fno-caller-saves.)
+AC_MSG_ERROR(Aborting due to known problem)
+	    ;;
+esac
+	;;
+esac
+AC_MSG_RESULT(no)
+fi
 dnl Inform compiler that certain flags are meant for the linker
 dnl XE_PROTECT_LINKER_FLAGS(shell_var)
 define([XE_PROTECT_LINKER_FLAGS], [
 if test "$GCC" = "yes"; then
 set x $[$1]; shift; [$1]=""
 XE_PROTECT_LINKER_FLAGS(ld_call_shared)
 dnl Add s&m-determined objects (including unexec) to link line
 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine)
 test -n "$objects_system"  && XE_ADD_OBJS($objects_system)
-test -n "$unexec"          && XE_ADD_OBJS($unexec)
+test -n "$unexec"          && test ! "$pdump" = "yes" && XE_ADD_OBJS($unexec)
+test "$pdump" = "yes" && XE_ADD_OBJS(dumper.o)
 dnl Dynodump (Solaris 2.x, x<6)
 AC_MSG_CHECKING(for dynodump)
 if test "$unexec" != "unexsol2.o"; then
 AC_MSG_RESULT(no)
 dnl /etc/ld.so.conf.  Since those are used at run time, it seems pretty
 dnl safe to use them at link time, and less controversial than forcing
 dnl the run-time to use the link-time libraries.  This also helps avoid
 dnl mismatches between the link-time and run-time libraries.
 dnl #### Unfortunately, there are horrible libc4 and libc5 libraries
 dnl listed in /etc/ld.so.conf on some systems, and including them on
 dnl the link path leads to linking in utterly broken libc's.
 dnl There are many clever ways of approaching this problem,
 dnl but finding out that actually works...
 dnl if test -z "$LD_RUN_PATH" -a -r "/etc/ld.so.conf"; then
 dnl   for dir in `cat /etc/ld.so.conf`; do
 dnl     test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_system)
 	doug_lea_malloc=yes
 else
 	doug_lea_malloc=no
 fi
 after_morecore_hook_exists=yes
-AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
 AC_MSG_CHECKING(whether __after_morecore_hook exists)
 AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
 [AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)
 after_morecore_hook_exists=no])
 if test "$system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(The GNU allocators don't work with this system configuration)."
+- The GNU allocators don't work with this system configuration."
 elif test "$with_system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(User chose not to use GNU allocators)."
+- User chose not to use GNU allocators."
 elif test "$with_debug_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(User chose to use Debugging Malloc)."
+- User chose to use Debugging Malloc."
 fi
-if test "$doug_lea_malloc" = "yes" ; then
+if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then
-if test "$GNU_MALLOC" = yes ; then
+GNU_MALLOC_reason="
-GNU_MALLOC_reason="
+- Using Doug Lea's new malloc from the GNU C Library."
-(Using Doug Lea's new malloc from the GNU C Library.)"
-fi
 AC_DEFINE(DOUG_LEA_MALLOC)
 if test "$after_morecore_hook_exists" = "no" ; then
 GNU_MALLOC_reason="
-(Using Doug Lea's new malloc from the Linux C Library.)"
+- Using Doug Lea's new malloc from the Linux C Library."
 AC_DEFINE(_NO_MALLOC_WARNING_)
 fi
-use_minimal_tagbits=yes
 fi
 dnl #### mcheck is broken in all versions of Linux libc and glibc.
 dnl Try this again when 2.1 hits the streets.
 dnl Avoid using free-hook.c if support exists for malloc debugging in libc
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_YACC
 dnl checks for header files
-AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(dnl
-AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h cygwin/version.h)
+a.out.h dnl
-AC_CHECK_HEADERS(kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h)
+cygwin/version.h dnl
+fcntl.h dnl
+inttypes.h dnl
+libgen.h dnl
+locale.h dnl
+mach/mach.h dnl
+sys/param.h dnl
+sys/pstat.h dnl
+sys/time.h dnl
+sys/timeb.h dnl
+sys/un.h dnl
+ulimit.h dnl
+unistd.h dnl
+utime.h dnl
+)
 AC_HEADER_SYS_WAIT
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
 AC_TYPE_UID_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_CHECK_TYPE(ssize_t, int)
+dnl check for Unix98 socklen_t
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([#include <sys/socket.h>
+socklen_t x;
+],[],[AC_MSG_RESULT(yes)],[
+AC_TRY_COMPILE([#include <sys/socket.h>
+int accept (int, struct sockaddr *, size_t *);
+],[],[
+AC_MSG_RESULT(size_t)
+AC_DEFINE(socklen_t,size_t)], [
+AC_MSG_RESULT(int)
+AC_DEFINE(socklen_t,int)])])
 AC_MSG_CHECKING(for struct timeval)
 AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 AC_CHECK_FUNCS(lockf flock)
 dnl The mail_use_xxx variables are set according to the s&m headers.
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 test -z "$mail_locking" -a "$mail_use_locking" = "yes" && mail_locking=locking
+if   test -z "$mail_locking"; then
+case "$opsys" in cygwin* | mingw*)
+mail_locking=pop ;;
+esac
+fi
 if   test "$mail_locking" = "lockf"; then AC_DEFINE(MAIL_LOCK_LOCKF)
 elif test "$mail_locking" = "flock"; then AC_DEFINE(MAIL_LOCK_FLOCK)
 elif test "$mail_locking" = "locking"; then AC_DEFINE(MAIL_LOCK_LOCKING)
+elif test "$mail_locking" = "pop"; then
+with_pop=yes
+mail_locking=
 else mail_locking="dot-locking"; AC_DEFINE(MAIL_LOCK_DOT)
 fi
 test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
 XE_DIE("lockf mail locking requested but not available.")
 test "$mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \
 fi
 else AC_MSG_RESULT(no)
 fi
 dnl Link with "-z ignore" on Solaris if supported
-if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
+if test "$opsys" = "sol2"; then
-AC_MSG_CHECKING(for \"-z ignore\" linker flag)
+if test "$os_release" -ge 56; then
-case "`ld -h 2>&1`" in
+AC_MSG_CHECKING(for \"-z ignore\" linker flag)
-*-z\ ignore\|record* ) AC_MSG_RESULT(yes)
+case "`ld -h 2>&1`" in
-XE_PREPEND(-z ignore, ld_switch_site) ;;
+*-z\ ignore\|record* ) AC_MSG_RESULT(yes)
-*) AC_MSG_RESULT(no) ;;
+XE_PREPEND(-z ignore, ld_switch_site) ;;
-esac
+*) AC_MSG_RESULT(no) ;;
+esac
+fi
 fi
 dnl ----------------------
 dnl Choose a window system
 dnl ----------------------
 break; dnl Only need ONE X11 implementation !
 fi
 done
 dnl Avoid version mismatch for shared library libXm.so on osf4
-if test "$GCC" = yes -a -d /usr/shlib; then XE_APPEND(-L/usr/shlib, X_LIBS); fi
+case "$opsys" in
+decosf*) if test "$GCC" = yes -a -d /usr/shlib; then XE_APPEND(-L/usr/shlib, X_LIBS); fi ;;
+esac
 ld_switch_x_site="$X_LIBS"
 XE_COMPUTE_RUNPATH()
 xmkmf_defines=`${MAKE-make} xetest 2>/dev/null | grep -v make`
 fi
 cd ..
 rm -fr conftestdir
 for word in $xmkmf_defines; do
-case "$word" in
+case "$word" in -D* )
-	-D*=* ) ;;
+	sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'`
-	-D* ) word=`echo '' $word | sed -e 's:^ *-D::'`
+	case "$word" in
-	      AC_DEFINE_UNQUOTED($word) ;;
+	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+	  *     ) val=1 ;;
+	esac
+dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+	  if test "$val" = "1"
+	    then AC_DEFINE_UNQUOTED($sym)
+	    else AC_DEFINE_UNQUOTED($sym,$val)
+	  fi
+	fi  ;;
 esac
 done
 fi
 dnl make sure we can find Intrinsic.h
 AC_TRY_RUN([#include <X11/Intrinsic.h>
 int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }],
 [./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
 AC_MSG_RESULT(R${x11_release})
 AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
+if test "${x11_release}" = "4"; then
+case "$with_widgets" in
+"" | "no") with_widgets=no ;;
+*) XE_DIE("Widget support requires X11R5 or greater") ;;
+esac
+fi
+AC_CHECK_FUNCS(XConvertCase)
 AC_CHECK_HEADERS(X11/Xlocale.h)
 dnl remove this - we should avoid checking for specific OS
 AC_MSG_CHECKING(for XFree86)
 AC_CHECKING(for MS-Windows)
 AC_CHECK_LIB(gdi32,main,with_msw=yes)
 if test "$with_msw" = "yes"; then
 AC_DEFINE(HAVE_MS_WINDOWS)
 install_pp="$blddir/lib-src/installexe.sh"
-XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool, libs_system)
+XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool, libs_system)
 test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
 if test "$window_system" != x11; then
 	window_system=msw
 	test "$with_scrollbars" != "no" && with_scrollbars=msw \
 	    && XE_ADD_OBJS(scrollbar-msw.o)
 fi
 dnl check for our special version of select
 AC_TRY_RUN([#include <fcntl.h>
 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }],
 [AC_DEFINE(HAVE_MSG_SELECT)])
-const_is_losing=no
 with_file_coding=yes
 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o)
 fi
 fi
 fi
 eval "with_${feature}=no"
 done
 fi
+dnl Balloon Help requires the Shape extension, not available everywhere,
+dnl for example not on AIX 4.3.
+if test "$with_x11" = "yes"; then
+AC_CHECK_HEADER(X11/extensions/shape.h, [
+AC_DEFINE(HAVE_BALLOON_HELP)
+XE_ADD_OBJS(balloon_help.o balloon-x.o)])
+fi
 dnl FSF 19.29 has some bitmapdir stuff here.
 bitmapdir=
 case "$window_system" in
 x11  ) HAVE_X_WINDOWS=yes; echo "  Using X11." ;;
 dnl Autodetect tooltalk
 if test "$with_tooltalk" != "no" ; then
 dnl autodetect the location of tt_c.h
 dnl tt_c.h might be in Tt or desktop include directories
 for dir in "" "Tt/" "desktop/" ; do
-AC_CHECK_HEADER(${dir}tt_c.h, tt_c_h_path="${dir}tt_c.h"; break)
+AC_CHECK_HEADER(${dir}tt_c.h, tt_c_h_file="${dir}tt_c.h"; break)
 done
-if test -z "$tt_c_h_path"; then
+if test -z "$tt_c_h_file"; then
 if test "$with_tooltalk" = "yes"; then
 USAGE_ERROR("Unable to find required tooltalk header files.")
 fi
 with_tooltalk=no
 fi
 fi
 fi
 test -z "$with_tooltalk" && with_tooltalk=yes
 if test "$with_tooltalk" = "yes"; then
 AC_DEFINE(TOOLTALK)
-AC_DEFINE_UNQUOTED(TT_C_H_PATH, "$tt_c_h_path")
+AC_DEFINE_UNQUOTED(TT_C_H_FILE, "$tt_c_h_file")
 XE_PREPEND($tt_libs, libs_x)
 XE_ADD_OBJS(tooltalk.o)
 fi
 dnl Autodetect CDE
 XE_PREPEND(-lldap, LIBS)
 fi
 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
 fi
+dnl Autodetect PostgreSQL
+dnl On many Linux systems, PostgreSQL is packaged to be installed in /usr;
+dnl in this case, configure will easily detect it there.
+dnl
+dnl If PostgreSQL is installed into a different prefix,
+dnl (such as the default /usr/local/pgsql when building from source),
+dnl that prefix must be specified using the --site-prefixes flag.
+if test "$with_postgresql" != "no"; then
+AC_CHECKING(for PostgreSQL)
+dnl Look for these standard header file locations, known to be used on Linux
+for header_dir in "" "pgsql/" "postgresql/"; do
+AC_CHECK_HEADER(${header_dir}libpq-fe.h,
+libpq_fe_h_file=${header_dir}libpq-fe.h; break)
+done
+test -n "$libpq_fe_h_file" && { AC_CHECK_LIB(pq,PQconnectdb,have_libpq=yes) }
+if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
+with_postgresql=yes
+AC_DEFINE(HAVE_POSTGRESQL)
+AC_CHECK_LIB(pq,PQconnectStart, [
+with_postgresqlv7=yes;
+AC_DEFINE(HAVE_POSTGRESQLV7)])
+AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
+XE_PREPEND(-lpq, LIBS)
+XE_ADD_OBJS(postgresql.o)
+elif test "$with_postgresql" = "yes"; then
+XE_DIE("Required PostgreSQL support cannot be provided.  Check --site-prefixes.")
+fi
+fi
 dnl ----------------------
 dnl Graphics libraries
 dnl ----------------------
 if test "$window_system" != "none"; then
 dnl Autodetect Xpm
 xpm_problem=""
 if test -z "$with_xpm"; then
 AC_MSG_CHECKING(for Xpm - no older than 3.4f)
 xe_check_libs=-lXpm
-AC_TRY_RUN([#include <X11/xpm.h>
+AC_TRY_RUN([#define XPM_NUMBERS
+#include <X11/xpm.h>
 int main(int c, char **v) {
 return c == 1 ? 0 :
 XpmIncludeVersion != XpmLibraryVersion() ? 1 :
 XpmIncludeVersion < 30406 ? 2 : 0 ;}],
 [./conftest dummy_arg; xpm_status=$?;
 XE_APPEND(lwlib-Xaw.o, lwlib_objs)
 dnl Add the Athena widget library we located earlier
 XE_PREPEND(-l$athena_lib, libs_x)
-dnl Export the path for lwlib, used to build and include the headers
+dnl Tell lwlib where to find the Athena header files.
-dnl from the right place later on.
+dnl Many people have tried to create a `smart' way of doing this,
-AC_DEFINE_UNQUOTED(ATHENA_H_PATH, $athena_h_path)
+dnl but all have failed.  Before changing the following ugly definitions,
+dnl consult the veterans of many a battle.
+AC_DEFINE_UNQUOTED(ATHENA_Scrollbar_h_,"$athena_h_path/Scrollbar.h")
+AC_DEFINE_UNQUOTED(ATHENA_Dialog_h_,"$athena_h_path/Dialog.h")
+AC_DEFINE_UNQUOTED(ATHENA_Form_h_,"$athena_h_path/Form.h")
+AC_DEFINE_UNQUOTED(ATHENA_Command_h_,"$athena_h_path/Command.h")
+AC_DEFINE_UNQUOTED(ATHENA_Label_h_,"$athena_h_path/Label.h")
+AC_DEFINE_UNQUOTED(ATHENA_LabelP_h_,"$athena_h_path/LabelP.h")
+AC_DEFINE_UNQUOTED(ATHENA_Toggle_h_,"$athena_h_path/Toggle.h")
+AC_DEFINE_UNQUOTED(ATHENA_ToggleP_h_,"$athena_h_path/ToggleP.h")
+AC_DEFINE_UNQUOTED(ATHENA_AsciiText_h_,"$athena_h_path/AsciiText.h")
+AC_DEFINE_UNQUOTED(ATHENA_XawInit_h_,"$athena_h_path/XawInit.h")
 AC_DEFINE(LWLIB_USES_ATHENA)
 AC_DEFINE(NEED_ATHENA)
+need_athena="yes"
 if test "$athena_3d" = "yes"; then
 AC_DEFINE(HAVE_ATHENA_3D)
 fi
 ;;
 dnl AIX needs the following library for use with Motif
 AC_CHECK_LIB(i18n, layout_object_getvalue, [XE_PREPEND(-li18n, libs_x)])
 XE_COMPUTE_RUNPATH()
 fi
-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask)
+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask)
+dnl Check for PTY support functions.
+dnl  getpt is the preferred pty allocation method on glibc systems.
+dnl _getpt is the preferred pty allocation method on SGI systems.
+dnl grantpt, unlockpt, ptsname are defined by Unix98.
+AC_CHECK_FUNCS(getpt _getpt grantpt unlockpt ptsname killpg tcgetpgrp)
+dnl openpty is the preferred pty allocation method on BSD and Tru64 systems.
+dnl openpty might be declared in pty.h or in libutil.h.
+AC_CHECK_FUNC(openpty, have_openpty=yes, [
+AC_CHECK_LIB(util, openpty, have_openpty=yes need_libutil=yes)])
+if test "$have_openpty" = "yes"; then
+AC_DEFINE(HAVE_OPENPTY)
+AC_CHECK_HEADERS(pty.h libutil.h)
+test "$need_libutil" = "yes" && XE_APPEND(-lutil, libs_system)
+fi
+dnl Check for STREAM support functions.
+dnl Confusingly, "str" means both "string" and "SysV Streams".
+AC_CHECK_HEADERS(sys/stropts.h)
+if test "$ac_cv_header_sys_stropts_h" = "yes"; then
+AC_CHECK_FUNCS(isastream)
+AC_CHECK_HEADERS(sys/strtio.h) dnl TIOCSIGNAL
+fi
 dnl Use our own realpath always.
 XE_ADD_OBJS(realpath.o)
-dnl Check whether the system provides getloadavg (Solaris 7 has it)
+dnl Check whether the system provides getloadavg().
 AC_CHECK_FUNCS(getloadavg)
-if test "$ac_cv_func_getloadavg" != "yes"
+if test "$ac_cv_func_getloadavg" = "yes"; then
-then
+dnl Solaris 8 declares getloadavg() in <sys/loadavg.h>.
+dnl glibc 2.2 declares getloadavg() in <stdlib.h>...
+dnl   ...if we #define _GNU_SOURCE, which we do.
+AC_CHECK_HEADERS(sys/loadavg.h)
+else
+dnl We define our own getloadavg() using lower level functions.
 XE_ADD_OBJS(getloadavg.o)
 dnl Used by getloadavg() - does not require root priveleges
 AC_CHECK_LIB(kstat, kstat_open)
+AC_CHECK_HEADERS(kstat.h)
 dnl Another way to get the load average
 AC_CHECK_LIB(kvm, kvm_read)
 fi
 #endif
 #endif
 ],
 [
 struct timeval time;
-struct timezone dummy;
+gettimeofday (&time, 0);
-gettimeofday (&time, &dummy);
 ],
 [AC_MSG_RESULT(two)],
 [AC_MSG_RESULT(one)
 AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)])
 fi
 AC_C_INLINE
-if test "$ac_cv_c_inline" != "no"; then
+test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
-AC_DEFINE(HAVE_INLINE)
-test "$GCC" = "yes" && XE_ADD_OBJS(inline.o)
-fi
 dnl HP-UX has a working alloca in libPW.
 dnl case "${GCC}${opsys}" in hpux* )
 dnl  AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)])
 dnl esac
 AC_MSG_RESULT($have_mmap)
 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP)
 dnl rel_alloc requires either GNU malloc or system malloc with mmap
 dnl We only turn rel_alloc on by default if mmap is available.
-test "$GNU_MALLOC" != "yes"   -a "$have_mmap" != "yes" && rel_alloc=no
+test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
-test "$rel_alloc" = "default" -a "$have_mmap"  = "yes" && rel_alloc=yes
+if test "$rel_alloc $have_mmap" = "default yes"; then
+if test "$doug_lea_malloc" = "yes"; then
+dnl Check if malloc() calls mmap(), making rel_alloc pointless.
+AC_MSG_CHECKING(for M_MMAP_THRESHOLD)
+AC_TRY_COMPILE([#include <malloc.h>],[
+#ifndef M_MMAP_THRESHOLD
+#error No M_MMAP_THRESHOLD :-(
+!@+$%^&*_)(_ - unlikely to compile...
+#endif
+], [rel_alloc=no; AC_MSG_RESULT(yes);], [rel_alloc=yes; AC_MSG_RESULT(no);])
+else
+rel_alloc=yes
+fi
+fi
 test "$rel_alloc" = "yes" && AC_DEFINE(REL_ALLOC)
 dnl Check for terminal I/O variants
 dnl TERMIOS systems may have termio.h, but not vice-versa, I think.
 AC_CHECK_HEADER(termios.h,
 for dir in "machine" "sys" "linux"; do
 AC_CHECK_HEADER(${dir}/soundcard.h,
 sound_found=yes
 need_miscplay=yes
 XE_ADD_OBJS(linuxplay.o)
-[AC_DEFINE_UNQUOTED(SOUNDCARD_H_PATH, "${dir}/soundcard.h")]
+[AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")]
 break)
 done
+fi
+dnl Win32 Native uses native sound
+if test -z "$sound_found"; then
+if test "$with_msw" = "yes"; then
+sound_found=yes
+native_sound_lib=
+fi
 fi
 test "$sound_found" = "yes" && with_native_sound=yes
 fi
 if test -z "$with_ncurses"; then
 AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no)
 fi
 if test "$with_ncurses" = "yes"; then
 AC_DEFINE(HAVE_NCURSES)
-AC_CHECK_HEADER(ncurses/curses.h, curses_h_path=ncurses/curses.h)
+AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
-AC_CHECK_HEADER(ncurses/term.h, term_h_path=ncurses/term.h)
+AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
 XE_ADD_OBJS(terminfo.o)
 XE_PREPEND(-lncurses, LIBS)
 if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
 dnl Try again, and check for the bogus ncurses/ include bug.
 dnl (i.e. ncurses/curses.h bogusly includes <unctrl.h> instead of
 dnl <ncurses/unctrl.h>)
 save_c_switch_site="$c_switch_site"
 c_switch_site="$c_switch_site -I/usr/include/ncurses"
-AC_CHECK_HEADER(ncurses/curses.h, curses_h_path=ncurses/curses.h)
+AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
 if test "$ac_cv_header_ncurses_curses_h" = "yes"
 then AC_MSG_WARN("Your system has the bogus ncurses include bug.")
 else c_switch_site="$save_c_switch_site"
 fi
 fi
 	  AC_CHECK_LIB(termcap, tgetent, XE_PREPEND(-ltermcap, LIBS),
 XE_ADD_OBJS(termcap.o)))
 fi
 fi
 fi
-AC_DEFINE_UNQUOTED(CURSES_H_PATH, "${curses_h_path-curses.h}")
+AC_DEFINE_UNQUOTED(CURSES_H_FILE, "${curses_h_file-curses.h}")
-AC_DEFINE_UNQUOTED(TERM_H_PATH, "${term_h_path-term.h}")
+AC_DEFINE_UNQUOTED(TERM_H_FILE, "${term_h_file-term.h}")
 dnl Autodetect gpm
 test -z "$with_gpm" && { AC_CHECK_HEADER(gpm.h, , with_gpm=no) }
 test -z "$with_gpm" && { AC_CHECK_LIB(gpm, Gpm_Open, with_gpm=yes, with_gpm=no) }
 if test "$with_gpm" = "yes"; then
 AC_DEFINE(HAVE_DBM)
 dnl Check for Berkeley DB.
 if test "$with_database_berkdb" != "no"; then
 AC_MSG_CHECKING(for Berkeley db.h)
-for path in "db/db.h" "db.h"; do
+for header in "db/db.h" "db.h"; do
-AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
+#ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
 typedef uint8_t  u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
 #ifdef WE_DONT_NEED_QUADS
 typedef uint64_t u_int64_t;
 #endif
 #endif
-#include <$path>
+#endif
-],[], db_h_path="$path"; break)
+#include <$header>
+],[], db_h_file="$header"; break)
 done
-if test -z "$db_h_path"
+if test -z "$db_h_file"
 then AC_MSG_RESULT(no); with_database_berkdb=no
-else AC_MSG_RESULT($db_h_path)
+else AC_MSG_RESULT($db_h_file)
 fi
 if test "$with_database_berkdb" != "no"; then
 AC_MSG_CHECKING(for Berkeley DB version)
 AC_EGREP_CPP(yes,
-[#include <$db_h_path>
+[#include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
 yes
 #endif
 ], [AC_MSG_RESULT(2); dbfunc=db_open], [AC_MSG_RESULT(1); dbfunc=dbopen])
 AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
 AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
 fi
 if test "$with_database_berkdb" = "yes"; then
-AC_DEFINE_UNQUOTED(DB_H_PATH, "$db_h_path")
+AC_DEFINE_UNQUOTED(DB_H_FILE, "$db_h_file")
 AC_DEFINE(HAVE_BERKELEY_DB)
 test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS)
 else with_database_berkdb=no
 fi
 fi
 dnl autodetect dll support
 if test "$with_modules" != "no"; then
 AC_CHECKING(for module support)
-dnl Find headers and libraries
+dnl Check for MS-Windows
-AC_CHECK_HEADER(dlfcn.h, [
+if test "$with_msw" = "yes"; then
-AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [
+have_dl=yes;
-AC_CHECK_LIB(c,  dlopen, [ have_dl=yes ])])])
-if test -n "$have_dl"; then
-AC_DEFINE(HAVE_DLOPEN)
 else
-AC_CHECK_LIB(dld, shl_load, [
+dnl Find headers and libraries
-libdl=dld have_dl=yes;
+AC_CHECK_HEADER(dlfcn.h, [
-AC_DEFINE(HAVE_SHL_LOAD)], [
+AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [
-AC_CHECK_LIB(dld, dld_init, [
+AC_CHECK_LIB(c,  dlopen, [ have_dl=yes ])])])
-libdl=dld have_dl=yes;
+if test -n "$have_dl"; then
-AC_DEFINE(HAVE_DLD_INIT)])])
+AC_DEFINE(HAVE_DLOPEN)
-fi
+else
+AC_CHECK_LIB(dld, shl_load, [
+libdl=dld have_dl=yes;
+AC_DEFINE(HAVE_SHL_LOAD)], [
+AC_CHECK_LIB(dld, dld_init, [
+libdl=dld have_dl=yes;
+AC_DEFINE(HAVE_DLD_INIT)])])
+fi
+fi dnl end !MS-Windows
 if test -n "$have_dl"; then
 dnl XE_SHLIB_STUFF (in aclocal.m4) defines $can_build_shared
 XE_SHLIB_STUFF
 fi
 *\$* ) eval "ETCDIR=$ETCDIR" ;;
 *) break ;;
 esac
 done
 AC_SUBST(ETCDIR)
-AC_SUBST(lockdir)
-AC_SUBST(LOCKDIR_USER_DEFINED)
-LOCKDIR=$lockdir
-while true; do
-case "$LOCKDIR" in
-*\$* ) eval "LOCKDIR=$LOCKDIR" ;;
-*) break ;;
-esac
-done
-AC_SUBST(LOCKDIR)
 AC_SUBST(docdir)
 AC_SUBST(DOCDIR_USER_DEFINED)
 DOCDIR=$docdir
 while true; do
 fi
 XE_SPACE(ac_configure_args, $ac_configure_args)
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$configuration")
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "$ac_configure_args")
-AC_DEFINE_UNQUOTED(config_machfile,  "$machfile")
-AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")
 dnl Following are deprecated
 null_string=""
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE,     $null_string)
 					      AC_DEFINE(USE_SYSTEM_MALLOC)
 fi
 test "$with_i18n3"         = "yes" && AC_DEFINE(I18N3)
 test "$GCC"                = "yes" && AC_DEFINE(USE_GCC)
 test "$external_widget"    = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
-test "$no_doc_file"        = "yes" && AC_DEFINE(NO_DOC_FILE)
+test "$quick_build"        = "yes" && AC_DEFINE(QUICK_BUILD)
-dnl test "$const_is_losing"    = "yes" && AC_DEFINE(CONST_IS_LOSING)
 test "$with_purify"        = "yes" && AC_DEFINE(PURIFY)
 test "$with_quantify"      = "yes" && AC_DEFINE(QUANTIFY)
 test "$with_pop"           = "yes" && AC_DEFINE(MAIL_USE_POP)
 test "$with_kerberos"      = "yes" && AC_DEFINE(KERBEROS)
 test "$with_hesiod"        = "yes" && AC_DEFINE(HESIOD)
 dnl Start stdout redirection to '| tee -a Installation'
 (
 echo "
 XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" configured for \`$canonical'.
+"
-Where should the build process find the source code?    $srcdir
+echo "
-What installation prefix should install use?		  $prefix
+Compilation / Installation:"
-What operating system and machine description files should XEmacs use?
+echo "  Source code location:              $srcdir"
-\`$opsysfile' and \`$machfile'
+echo "  Installation prefix:               $prefix"
-What compiler should XEmacs be built with?              $CC $CFLAGS
+if test -n "$site_includes"; then
-Should XEmacs use the GNU version of malloc?            ${GNU_MALLOC}${GNU_MALLOC_reason}
+echo "  Additional header files:           $site_includes"
-Should XEmacs use the relocating allocator for buffers? $rel_alloc
+fi
-What window system should XEmacs use?                   ${window_system}"
+if test -n "$site_libraries"; then
+echo "  Additional libraries:              $site_libraries"
+fi
+if test -n "$site_prefixes"; then
+echo "  Additional prefixes:               $site_prefixes"
+fi
+if test -n "$runpath"; then
+echo "  Runtime library search path:       $runpath"
+fi
+if test -n "$opsysfile"
+then echo "  Operating system description file: \`$opsysfile'"
+else echo "  Not using any operating system description file"
+fi
+if test -n "$machfile"
+then echo "  Machine description file:          \`$machfile'"
+else echo "  Not using any machine description file"
+fi
+echo "  Compiler:                          $CC $CFLAGS"
+echo "  Relocating allocator for buffers:  $rel_alloc"
+echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
+echo "
+Window System:"
+if test "$with_msw" = "yes"; then
+echo "  Compiling in support for the Microsoft window system."
+fi
 if test "$with_x11" = "yes"; then
-echo "  Where do we find X Windows header files?                $x_includes"
+echo "  Compiling in support for the X window system:"
-echo "  Where do we find X Windows libraries?                   $x_libraries"
+echo "    - X Windows headers location:                 $x_includes"
-fi
+echo "    - X Windows libraries location:               $x_libraries"
-if test -n "$site_includes"; then
+if test "$with_xauth" != yes; then
-echo "  Additional header files:                                $site_includes"
+echo "    - Xau (X authority) not available."
 fi
-if test -n "$site_libraries"; then
+if test "$with_xmu" != yes; then
-echo "  Additional libraries:                                   $site_libraries"
+echo "    - Xmu library not available; substituting equivalent routines."
 fi
-if test -n "$site_prefixes"; then
+if test "$with_wmcommand" != no; then
-echo "  Additional prefixes:                                    $site_prefixes"
+echo "    - Handling WM_COMMAND properly."
 fi
-if test -n "$runpath"; then
+fi
-echo "  Runtime library search path:                            $runpath"
+if test "$need_athena" = "yes"; then
-fi
+echo "  Compiling in support for the Athena widget set:"
-if test "$have_xaw" = "yes"; then
+echo "    - Athena headers location:                    $athena_h_path"
-echo "  Athena library to link:                                 $athena_lib"
+echo "    - Athena library to link:                     $athena_lib"
-echo "  Athena header include path:                             $athena_h_path"
+fi
-fi
-test "$with_dnet"  = yes && echo "  Compiling in support for DNET."
-test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
-test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
-if test "$with_xmu" != yes -a "$with_x11" = yes; then
-echo "  No Xmu; substituting equivalent routines."
-fi
-if test "$with_xpm" = yes; then
-echo "  Compiling in support for XPM images."
-elif test "$with_x11" = yes; then
-echo "  --------------------------------------------------------------------"
-echo "  WARNING: Compiling without XPM support."
-if test "$xpm_problem" != ""; then
-echo "  Reason: $xpm_problem"
-fi
-echo "  WARNING: You should strongly consider installing XPM."
-echo "  WARNING: Otherwise toolbars and other graphics will look suboptimal."
-echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
-echo "  --------------------------------------------------------------------"
-fi
-if test "$with_png" = yes; then
-echo "  Compiling in support for PNG image handling."
-elif test "$window_system" != "none"; then
-echo "  --------------------------------------------------------------------"
-echo "  WARNING: Compiling without PNG image support."
-if test "$png_problem" != ""; then
-echo "  Reason: $png_problem"
-fi
-echo "  WARNING: You should strongly consider installing the PNG libraries."
-echo "  WARNING: Otherwise certain images and glyphs may not display."
-echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
-echo "  --------------------------------------------------------------------"
-fi
-test "$with_gif"   = yes && echo "  Compiling in support for (builtin) GIF image handling."
-test "$with_jpeg"  = yes && echo "  Compiling in support for JPEG image handling."
-test "$with_tiff"  = yes && echo "  Compiling in support for TIFF image handling."
-test "$with_xface" = yes && echo "  Compiling in support for X-Face message headers."
-test "$with_native_sound" = yes && echo "  Compiling in native sound support."
-test "$with_nas_sound"    = yes && echo "  Compiling in network sound (NAS) support."
-test "$old_nas"           = yes && echo "     nas library lacks error trapping, will play synchronously."
-test "$with_esd_sound"    = yes && echo "  Compiling in support for Enlightened Sound Daemon (ESD)."
-test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley DB."
-test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
-test "$with_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
-test "$with_ldap"	     = yes && echo "  Compiling in support for LDAP."
-test "$with_ncurses"  = yes && echo "  Compiling in support for ncurses."
-test "$with_gpm"      = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
-test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
-test "$with_file_coding"     = yes && echo "  Compiling in File coding support."
-test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
-test "$with_xim" = motif    && echo "    Using Motif to provide XIM support."
-test "$with_xim" = xlib     && echo "    Using raw Xlib to provide XIM support."
-test "$with_xfs" = yes      && echo "    Using XFontSet to provide bilingual menubar."
-test "$with_canna"    = yes && echo "  Compiling in support for Canna on Mule."
-if test "$with_wnn" = yes; then
-echo "  Compiling in support for the WNN input method on Mule."
-test "$with_wnn6" = yes && echo "    Using WNN version 6."
-fi
-test "$with_i18n3"    = yes && echo "  Compiling in I18N support, level 3 (doesn't currently work)."
-test "$with_cde"      = yes && echo "  Compiling in support for CDE."
-test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
-test "$with_offix"    = yes && echo "  Compiling in support for OffiX."
-test "$with_dragndrop" = yes && echo "  Compiling in EXPERIMENTAL support for Drag'n'Drop ($dragndrop_proto )."
-test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
-test "$with_wmcommand"  != no && echo "  Compiling in support for proper WM_COMMAND handling."
 case "$with_menubars" in
 lucid ) echo "  Using Lucid menubars." ;;
 motif ) echo "  Using Motif menubars."
 echo "  *WARNING*  The Motif menubar implementation is currently buggy."
 echo "             We recommend using the Lucid menubar instead."
 echo "             Re-run configure with --with-menubars='lucid'." ;;
 msw ) echo "  Using MS-Windows menubars." ;;
 esac
 case "$with_scrollbars" in
-lucid    ) echo "  Using Lucid scrollbars."     ;;
+lucid  ) echo "  Using Lucid scrollbars."      ;;
-motif    ) echo "  Using Motif scrollbars."     ;;
+motif  ) echo "  Using Motif scrollbars."      ;;
-athena   ) echo "  Using Athena scrollbars."    ;;
+athena ) echo "  Using Athena scrollbars."     ;;
 msw ) echo "  Using MS-Windows scrollbars." ;;
+esac
+case "$with_dialogs" in
+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 --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 "$with_widgets" in
-motif    ) echo "  Using Motif native widgets."     ;;
+motif  ) echo "  Using Motif native widgets."      ;;
-athena   ) echo "  Using Athena native widgets."    ;;
+athena ) echo "  Using Athena native widgets."     ;;
 msw ) echo "  Using MS-Windows native widgets." ;;
 esac
-case "$with_dialogs" in
+if test "$with_dragndrop" = yes; then
-motif    )
+echo "  Compiling in support for Drag'n'Drop (EXPERIMENTAL)."
-echo "  Using Motif dialog boxes."
+echo "    -  Drag'n'Drop prototype:                             $dragndrop_proto."
-if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
+fi
-echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
-echo "             We recommend using the Athena dialog boxes instead."
+echo "
-echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
+TTY:"
-echo "             Read the PROBLEMS file for more information."
+test "$with_ncurses" = yes && echo "  Compiling in support for ncurses."
-fi; fi
+test "$with_gpm" = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
-;;
-athena   ) echo "  Using Athena dialog boxes."    ;;
+echo "
-msw ) echo "  Using MS-Windows dialog boxes." ;;
+Images:"
-esac
+test "$with_gif" = yes && echo "  Compiling in support for GIF  images (builtin)."
-test "$with_modules" = "yes" && echo "  Compiling in dynamic shared object module support."
+if test "$with_xpm" = yes; then
-test "$with_clash_detection" = yes && \
+echo "  Compiling in support for XPM  images."
-echo "  Clash detection will use \"$lockdir\" for locking files."
+elif test "$with_x11" = yes; then
-echo "  movemail will use \"$mail_locking\" for locking mail spool files."
+echo "  WARNING: -----------------------------------------------------------"
-test "$with_pop"	= yes && echo "  Using POP for mail access."
+echo "  WARNING: Compiling without XPM image support."
-test "$with_kerberos"	= yes && echo "  Using Kerberos for POP authentication."
+if test "$xpm_problem" != ""; then
-test "$with_hesiod"	= yes && echo "  Using Hesiod to get POP server host."
+echo "  Reason: $xpm_problem"
-test "$use_union_type"  = yes && echo "  Using the union type for Lisp_Objects."
+fi
-test "$pdump"           = yes && echo "  Using the new portable dumper (wishful thinking)."
+echo "  WARNING: You should strongly consider installing XPM."
-test "$debug"           = yes && echo "  Compiling in extra code for debugging."
+echo "  WARNING: Otherwise toolbars and other graphics will look suboptimal."
-test "$usage_tracking"  = yes && echo "  Compiling with usage tracking active (Sun internal)."
+echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
-if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \
+echo "  WARNING: -----------------------------------------------------------"
-!= "no no no no no"; then
+fi
+if test "$with_png" = yes; then
+echo "  Compiling in support for PNG  images."
+elif test "$window_system" != "none"; then
+echo "  WARNING: -----------------------------------------------------------"
+echo "  WARNING: Compiling without PNG image support."
+if test "$png_problem" != ""; then
+echo "  Reason: $png_problem"
+fi
+echo "  WARNING: You should strongly consider installing the PNG libraries."
+echo "  WARNING: Otherwise certain images and glyphs may not display."
+echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
+echo "  WARNING: -----------------------------------------------------------"
+fi
+test "$with_jpeg" = yes && echo "  Compiling in support for JPEG images."
+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 "$with_native_sound" = yes && echo "  Compiling in support for sound (native)."
+test "$with_nas_sound" = yes && echo "  Compiling in support for NAS (network audio system)."
+test "$old_nas" = yes && echo "    - NAS library lacks error trapping; will play synchronously."
+test "$with_esd_sound" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
+echo "
+Databases:"
+test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
+test "$with_database_dbm"    = yes && echo "  Compiling in support for 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 "$with_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
+test "$with_file_coding" = yes && echo "  Compiling in support for file coding."
+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 "$with_canna" = yes && echo "  Compiling in support for Canna on Mule."
+if test "$with_wnn" = yes; then
+echo "  Compiling in support for the WNN input method on Mule."
+test "$with_wnn6" = yes && echo "    - Using WNN version 6."
+fi
+test "$with_i18n3" = yes && echo "  Compiling in support for I18N level 3 (doesn't currently work)."
+echo "
+Mail:"
+test "$with_pop" = yes && echo "  Compiling in support for POP mail retrieval."
+test "$with_kerberos" = yes && echo "  Compiling in support for Kerberos POP authentication."
+test "$with_hesiod" = yes && echo "  Compiling in support for Hesiod POP server access."
+test -n "$mail_locking" && echo "  Compiling in support for \"$mail_locking\" mail spool file locking method."
+echo "
+Other Features:"
+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 "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
+test "$use_union_type" = yes && echo "  Using the union type for Lisp_Objects."
+test "$pdump" = yes && echo "  Using the new portable dumper."
+test "$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 "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc $error_check_glyphs" \
+!= "no no no no no no"; then
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: Compiling in support for runtime error checking."
 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: ---------------------------------------------------------"
 | sed -e 's/^\#.*//'		\
 dnl Delete spurious blanks inserted by $CPP
 	-e 's/^[ TAB][ TAB]*$//'\
 	-e 's/^ /TAB/'		\
 dnl Delete blank lines
-| sed -n -e '/^..*$/p'	\
+	-e '/^[ ]*$/d'	\
 dnl Restore lines quoted above to original contents.
-| sed '/^\"/ {
+	-e '/^\"/ {
 	s/\\\([\"]\)/\1/g
 	s/^[ TAB]*\"//
 	s/\"[ TAB]*$//
 }' > Makefile.new
 chmod 444 Makefile.new

Mercurial > hg > xemacs-beta

comparison configure.in @ 442:abe6d1db359e r21-2-36