X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f6f32e5a435cc82dc9fe52fbb84975bcc6bca1a4..1dc5112cb79d3cd63fd6a31b1c855f821a925688:/configure1.in diff --git a/configure1.in b/configure1.in index f968874228..9084e20dee 100755 --- a/configure1.in +++ b/configure1.in @@ -2,26 +2,26 @@ dnl This is an autoconf script. dnl To rebuild the `configure' script from this, execute the command dnl autoconf dnl in the directory containing this script. You must have autoconf -dnl version 1.4 or later. +dnl version 1.7 or later. dnl dnl The following text appears in the resulting `configure' script, dnl explaining how to rebuild it. [#!/bin/sh #### Configuration script for GNU Emacs -#### Copyright (C) 1992 Free Software Foundation, Inc. +#### Copyright (C) 1992, 1994 Free Software Foundation, Inc. ### 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 1.4 or later. +### in the this directory. You must have autoconf version 1.7 or later. ### This file is part of GNU Emacs. ### GNU Emacs is free software; you can redistribute it and/or modify ### it under the terms of the GNU General Public License as published by -### the Free Software Foundation; either version 1, or (at your option) +### the Free Software Foundation; either version 2, or (at your option) ### any later version. ### GNU Emacs is distributed in the hope that it will be useful, @@ -33,7 +33,6 @@ dnl explaining how to rebuild it. ### along with GNU Emacs; see the file COPYING. If not, write to ### the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - ### Since Emacs has configuration requirements that autoconf can't ### meet, this file is an unholy marriage of custom-baked ### configuration code and autoconf macros. @@ -48,7 +47,6 @@ dnl explaining how to rebuild it. ### If configure fails after disturbing the status quo, ### config.status is removed. - ### Remove any more than one leading "." element from the path name. ### If we don't remove them, then another "./" will be prepended to ### the file name each time we use config.status, and the program name @@ -64,6 +62,40 @@ dnl explaining how to rebuild it. progname="`echo $0 | sed 's:^\./\./:\./:'`" +### Establish some default values. +run_in_place= +single_tree= +prefix='/usr/local' +exec_prefix='${prefix}' +bindir='${exec_prefix}/bin' +datadir='${prefix}/lib' +statedir='${prefix}/lib' +libdir='${exec_prefix}/lib' +mandir='${prefix}/man/man1' +infodir='${prefix}/info' +lispdir='${datadir}/emacs/${version}/lisp' +locallisppath='${datadir}/emacs/site-lisp' +lisppath='${locallisppath}:${lispdir}' +etcdir='${datadir}/emacs/${version}/etc' +lockdir='${statedir}/emacs/lock' +archlibdir='${libdir}/emacs/${version}/${configuration}' +docdir='${datadir}/emacs/${version}/etc' + +# On Sun systems, people sometimes set up the variable CPP +# with a value that is a directory, not an executable at all. +# Detect that case, and ignore that value. +if [ "x$CPP" != x ] && [ -d "$CPP" ]; +then + CPP= +fi + +# We cannot use this variable in the case statement below, because many +# /bin/sh's have broken semantics for "case". Unfortunately, you must +# actually edit the clause itself. +# path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir" +# path_options="$path_options | archlibdir | statedir | mandir | infodir" +# path_options="$path_options | lispdir | lockdir | lisppath | locallisppath" + #### Usage messages. short_usage="Usage: ${progname} CONFIGURATION [-OPTION[=VALUE] ...] @@ -72,14 +104,28 @@ Set compilation and installation parameters for GNU Emacs, and report. CONFIGURATION specifies the machine and operating system to build for. --with-x Support the X Window System. --with-x=no Don't support X. ---x-includes=DIR Search for X header files in DIR. ---x-libraries=DIR Search for X libraries in DIR. +--with-x-toolkit Use an X toolkit. +--with-x-toolkit=no Don't use an X toolkit. --with-gcc Use GCC to compile Emacs. --with-gcc=no Don't use GCC to compile Emacs. +--x-includes=DIR Search for X header files in DIR. +--x-libraries=DIR Search for X libraries in DIR. --run-in-place Use libraries and data files directly out of the source tree. ---srcdir=DIR Look for source in DIR. ---prefix=DIR Install files below dir. +--single-tree=DIR Has the effect of creating a directory tree at DIR + which looks like: + .../DIR/bin/CONFIGNAME (emacs, etags, etc.) + .../DIR/bin/CONFIGNAME/etc (movemail, etc.) + .../DIR/common/lisp (emacs' lisp files) + .../DIR/common/site-lisp (local lisp files) + .../DIR/common/lib (DOC, TUTORIAL, etc.) + .../DIR/common/lock (lockfiles) +--srcdir=DIR Look for the Emacs source files in DIR. +--prefix=DIR Install files below DIR. Defaults to \`${prefix}'. + +You may also specify any of the \`path' variables found in Makefile.in, +including --bindir, --libdir, --etcdir, --infodir, and so on. This allows +you to override a single default location when configuring. If successful, ${progname} leaves its status in config.status. If unsuccessful after disturbing the status quo, it removes config.status." @@ -90,28 +136,26 @@ unsuccessful after disturbing the status quo, it removes config.status." ### Record all the arguments, so we can save them in config.status. arguments="$@" -### These values are used to comment and uncomment different values -### for the path variables in the Makefile, to choose the installed -### configuration or the run-in-place configuration. -rip_paths='#disabled# ' -inst_paths='' - -### Establish some default values. -prefix='/usr/local' -exec_prefix='${prefix}' +### Shell Magic: Quote the quoted arguments in ARGUMENTS. At a later date, +### in order to get the arguments back in $@, we have to do an +### `eval set x "$quoted_arguments"; shift'. +quoted_arguments= +for i in "$@"; do + quoted_arguments="$quoted_arguments '$i'" +done ### Don't use shift -- that destroys the argument list, which autoconf needs ### to produce config.status. It turns out that "set - ${arguments}" doesn't ### work portably. -index=0 -while [ $index -lt $# ]; do - index=`expr $index + 1` - arg=`eval echo '$'$index` +### However, it also turns out that many shells cannot expand ${10} at all. +### So using an index variable doesn't work either. It is possible to use +### some shell magic to make 'set x "$arguments"; shift' work portably. +while [ $# != 0 ]; do + arg="$1"; shift case "${arg}" in ## Anything starting with a hyphen we assume is an option. -* ) - ## Separate the switch name from the value it's being given. case "${arg}" in -*=*) @@ -152,6 +196,27 @@ Set it to either \`yes' or \`no'." eval "${opt}=\"${val}\"" ;; + ## Has the user specified which toolkit they want to support? + "with_x_toolkit" ) + ## Make sure the value given was either "yes" or "no". + case "${val}" in + y | ye | yes ) val=athena ;; + n | no ) val=no ;; + l | lu | luc | luci | lucid ) val=lucid ;; + a | at | ath | athe | athena ) val=athena ;; + m | mo | mot | moti | motif ) val=motif ;; + o | op | ope | open | open- | open-l | open-lo \ + | open-loo | open-look ) val=open-look ;; + * ) + (echo "${progname}: the \`--${optname}' option is supposed to have a value +which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'." + echo "${short_usage}") >&2 + exit 1 + ;; + esac + eval "${opt}=\"${val}\"" + ;; + ## Has the user specified whether or not they want GCC? "with_gcc" | "with_gnu_cc" ) ## Make sure the value given was either "yes" or "no". @@ -173,14 +238,13 @@ Set it to either \`yes' or \`no'." ## If the value was omitted, get it from the next argument. if [ "${valomitted}" = "yes" ]; then ## Get the next argument from the argument list, if there is one. - if [ $index = $# ]; then + if [ $# = 0 ]; then (echo "${progname}: You must give a value for the \`--${optname}' option, as in \`--${optname}=FOO'." echo "${short_usage}") >&2 exit 1 fi - index=`expr $index + 1` - val=`eval echo '$'$index` + val="$1"; shift fi srcdir="${val}" ;; @@ -193,74 +257,62 @@ Set it to either \`yes' or \`no'." ## If the value was omitted, get it from the next argument. if [ "${valomitted}" = "yes" ]; then ## Get the next argument from the argument list, if there is one. - if [ $index = $# ]; then + if [ $# = 0 ]; then (echo "${progname}: You must give a value for the \`--${optname}' option, as in - \`--${optname}=FOO'." + \`--${optname}=/usr/local/X11/include'." echo "${short_usage}") >&2 exit 1 fi - index=`expr $index + 1` - val=`eval echo '$'$index` + val="$1"; shift fi x_includes="${val}" - C_SWITCH_X_SITE="-I\"${x_includes}\"" ;; "x_libraries" ) ## If the value was omitted, get it from the next argument. if [ "${valomitted}" = "yes" ]; then ## Get the next argument from the argument list, if there is one. - if [ $index = $# ]; then + if [ $# = 0 ]; then (echo "${progname}: You must give a value for the \`--${optname}' option, as in - \`--${optname}=FOO'." + \`--${optname}=/usr/local/X11/lib'." echo "${short_usage}") >&2 exit 1 fi - index=`expr $index + 1` - val=`eval echo '$'$index` + val="$1"; shift fi x_libraries="${val}" - LD_SWITCH_X_SITE="-L\"${x_libraries}\"" ;; ## Should this use the "development configuration"? "run_in_place" ) - rip_paths='' - inst_paths='#disabled# ' + single_tree= + run_in_place=1 ;; - ## Has the user specified an installation prefix? - "prefix" ) - ## If the value was omitted, get it from the next argument. - if [ "${valomitted}" = "yes" ]; then - ## Get the next argument from the argument list, if there is one. - if [ $index = $# ]; then - (echo "${progname}: You must give a value for the \`--${optname}' option, as in - \`--${optname}=FOO'." - echo "${short_usage}") >&2 - exit 1 - fi - index=`expr $index + 1` - val=`eval echo '$'$index` - fi - prefix="${val}" - ;; + ## Should this use the "single tree" configuration? + "single_tree" ) + run_in_place= + single_tree=1 + ;; - ## Has the user specified an installation prefix? - "exec_prefix" ) - ## If the value was omitted, get it from the next argument. - if [ "${valomitted}" = "yes" ]; then - ## Get the next argument from the argument list, if there is one. - if [ $index = $# ]; then - (echo "${progname}: You must give a value for the \`--${optname}' option, as in - \`--${optname}=FOO'." - echo "${short_usage}") >&2 - exit 1 - fi - index=`expr $index + 1` - val=`eval echo '$'$index` - fi - exec_prefix="${val}" - ;; + ## Has the user specified one of the path options? + prefix | exec_prefix | bindir | libdir | etcdir | datadir | \ + archlibdir | statedir | mandir | infodir | lispdir | lockdir | \ + lisppath | locallisppath | docdir ) + ## If the value was omitted, get it from the next argument. + if [ "${valomitted}" = "yes" ]; then + if [ $# = 0 ]; then + (echo \ +"$progname: You must give a value for the \`--${optname}' option,"; + echo \ +"as in \`--${optname}=`eval echo '$'$optname`.'" + echo "$short_usage") >&2 + exit 1 + fi + val="$1"; shift + fi + eval "${opt}=\"${val}\"" + eval "${opt}_specified=1" + ;; ## Verbose flag, tested by autoconf macros. "verbose" ) @@ -269,7 +321,12 @@ Set it to either \`yes' or \`no'." ## Has the user asked for some help? "usage" | "help" ) - echo "${short_usage}" | more + if [ "x$PAGER" = x ] + then + echo "${short_usage}" | more + else + echo "${short_usage}" | $PAGER + fi exit ;; @@ -286,6 +343,9 @@ Set it to either \`yes' or \`no'." esac done +### Get the arguments back. See the diatribe on Shell Magic above. +eval set x "$quoted_arguments"; shift + if [ "${configuration}" = "" ]; then echo '- You did not tell me what kind of host system you want to configure. - I will attempt to guess the kind of system this is.' 1>&2 @@ -350,7 +410,7 @@ case "${srcdir}" in . ) ## We may be able to use the $PWD environment variable to make this ## absolute. But sometimes PWD is inaccurate. - if [ "${PWD}" != "" ] && [ "`(cd ${PWD} ; pwd)`" = "`pwd`" ] ; then + if [ "${PWD}" != "" ] && [ "`(cd ${PWD} ; sh -c pwd)`" = "`pwd`" ] ; then srcdir="$PWD" else srcdir="`(cd ${srcdir}; pwd)`" @@ -359,18 +419,26 @@ case "${srcdir}" in * ) srcdir="`(cd ${srcdir}; pwd)`" ;; esac -#### Make sure that the source directory doesn't already have a -#### configured system in it. +#### Check if the source directory already has a configured system in it. if [ `pwd` != `(cd ${srcdir} && pwd)` ] \ && [ -f "${srcdir}/src/config.h" ] ; then - (echo "${progname}: the directory tree \`${srcdir}' is being used" + (echo "${progname}: WARNING: The directory tree \`${srcdir}' is being used" echo " as a build directory right now; it has been configured in its own" - echo " right. You can't use srcdir in this situation.") >&2 - exit 1 + echo " right. To configure in another directory as well, you MUST" + echo " use GNU make. If you do not have GNU make, then you must" + echo " now do \`make distclean' in ${srcdir}," + echo " and then run ${progname} again.") >&2 + extrasub='/^VPATH[ ]*=/c\ +vpath %.c $(srcdir)\ +vpath %.h $(srcdir)\ +vpath %.y $(srcdir)\ +vpath %.l $(srcdir)\ +vpath %.s $(srcdir)\ +vpath %.in $(srcdir)' fi ### Make the necessary directories, if they don't exist. -for dir in ./src ./lib-src ./cpp ./oldXMenu ./etc ; do +for dir in ./src ./lib-src ./cpp ./oldXMenu ./lwlib ./etc ; do if [ ! -d ${dir} ]; then mkdir ${dir} fi @@ -449,6 +517,11 @@ case "${canonical}" in machine=7300 opsys=usg5-2-2 ;; + ## Bull dpx20 + rs6000-bull-bosx* ) + machine=ibmrs6000 opsys=aix3-2 + ;; + ## Bull dpx2 m68*-bull-sysv3* ) machine=dpx2 opsys=usg5-3 @@ -499,7 +572,7 @@ case "${canonical}" in ;; ## DECstations - mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0 | mips-dec-bsd4.2 ) + mips-dec-ultrix[0-3].* | mips-dec-ultrix4.0* | mips-dec-bsd4.2* ) machine=pmax opsys=bsd4-2 ;; mips-dec-ultrix* | mips-dec-bsd* ) @@ -510,8 +583,16 @@ case "${canonical}" in ;; ## Motorola Delta machines - m68*-motorola-sysv* ) + m68k-motorola-sysv* | m68000-motorola-sysv* ) machine=delta opsys=usg5-3 + if [ -z "`type gnucc | grep 'not found'`" ] + then CC=gnucc + else + if [ -z "`type gcc | grep 'not found'`" ] + then CC=gcc + else CC=cc + fi + fi ;; m88k-motorola-sysv4* ) machine=delta88k opsys=usg5-4 @@ -541,16 +622,30 @@ case "${canonical}" in ## The GEC 93 - apparently, this port isn't really finished yet. ## Gould Power Node and NP1 - pn-gould-bsd4.2 ) + pn-gould-bsd4.2* ) machine=gould opsys=bsd4-2 ;; - pn-gould-bsd4.3 ) + pn-gould-bsd4.3* ) machine=gould opsys=bsd4-3 ;; np1-gould-bsd* ) machine=gould-np1 opsys=bsd4-3 ;; + ## Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000 + ## as far as Emacs is concerned). + m88k-harris-cxux* ) + # Build needs to be different on 7.0 and later releases + case "`uname -r`" in + [56].[0-9] ) machine=nh4000 opsys=cxux ;; + [7].[0-9] ) machine=nh4000 opsys=cxux7 ;; + esac + ;; + ## Harris ecx or gcx running CX/UX (Series 1200, Series 3000) + m68k-harris-cxux* ) + machine=nh3000 opsys=cxux + ;; + ## Honeywell XPS100 xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 @@ -560,9 +655,15 @@ case "${canonical}" in m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;; + m68*-hp-netbsd* ) + machine=hp9000s300 opsys=netbsd + ;; ## HP/UX 7, 8 and 9 are supported on these machines. m68*-hp-hpux* ) case "`uname -r`" in + ## Someone's system reports A.B8.05 for this. + ## I wonder what other possibilities there are. + *.B8.* ) machine=hp9000s300 opsys=hpux8 ;; *.08.* ) machine=hp9000s300 opsys=hpux8 ;; *.09.* ) machine=hp9000s300 opsys=hpux9 ;; *) machine=hp9000s300 opsys=hpux ;; @@ -584,6 +685,9 @@ case "${canonical}" in hppa*-hp-hpux* ) ## Cross-compilation? Nah! case "`uname -r`" in + ## Someone's system reports A.B8.05 for this. + ## I wonder what other possibilities there are. + *.B8.* ) machine=hp9000s800 opsys=hpux8 ;; *.08.* ) machine=hp9000s800 opsys=hpux8 ;; *.09.* ) machine=hp9000s800 opsys=hpux9 ;; *) machine=hp9000s800 opsys=hpux ;; @@ -599,28 +703,31 @@ case "${canonical}" in ;; ## IBM machines - i386-ibm-aix1.1 ) + i386-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;; - i386-ibm-aix1.[23] | i386-ibm-aix* ) + i386-ibm-aix1.[23]* | i386-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;; - rs6000-ibm-aix3.1 ) + i370-ibm-aix*) + machine=ibm370aix opsys=usg5-3 + ;; + rs6000-ibm-aix3.1* ) machine=ibmrs6000 opsys=aix3-1 ;; - rs6000-ibm-aix3.2 | rs6000-ibm-aix* ) + rs6000-ibm-aix3.2* | rs6000-ibm-aix* ) machine=ibmrs6000 opsys=aix3-2 ;; - romp-ibm-bsd4-3 ) + romp-ibm-bsd4.3* ) machine=ibmrt opsys=bsd4-3 ;; - romp-ibm-bsd4-2 ) + romp-ibm-bsd4.2* ) machine=ibmrt opsys=bsd4-2 ;; - romp-ibm-aos4-3 ) + romp-ibm-aos4.3* ) machine=ibmrt opsys=bsd4-3 ;; - romp-ibm-aos4-2 ) + romp-ibm-aos4.2* ) machine=ibmrt opsys=bsd4-2 ;; romp-ibm-aos* ) @@ -634,10 +741,10 @@ case "${canonical}" in ;; ## Integrated Solutions `Optimum V' - m68*-isi-bsd4.2 ) + m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;; - m68*-isi-bsd4.3 ) + m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;; @@ -656,29 +763,37 @@ case "${canonical}" in machine=symmetry opsys=bsd4-3 ;; + ## Unspecified sysv on an ncr machine defaults to svr4. + i[34]86-ncr-sysv* ) + machine=intel386 opsys=usg5-4 + ;; + ## Intel 860 - i860-*-sysvr4 ) + i860-*-sysv4* ) machine=i860 opsys=usg5-4 ;; ## Silicon Graphics machines ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) - m68*-sgi-iris3.5 ) + m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;; - m68*-sgi-iris3.6 | m68*-sgi-iris*) + m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;; ## Iris 4D mips-sgi-irix3.* ) machine=iris4d opsys=irix3-3 ;; + mips-sgi-irix5.* ) + machine=iris4d opsys=irix5-0 + ;; mips-sgi-irix4.* | mips-sgi-irix* ) machine=iris4d opsys=irix4-0 ;; ## Masscomp machines - m68*-masscomp-rtu ) + m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;; @@ -704,6 +819,8 @@ case "${canonical}" in ;; mips-mips-riscos4* ) machine=mips4 opsys=bsd4-3 + NON_GNU_CC="cc -systype bsd43" + NON_GNU_CPP="cc -systype bsd43 -E" ;; mips-mips-bsd* ) machine=mips opsys=bsd4-3 @@ -713,7 +830,7 @@ case "${canonical}" in ;; ## NeXT - m68*-next-mach* | m68*-next-bsd* ) + m68*-next-* ) machine=next opsys=mach2 ;; @@ -753,23 +870,29 @@ case "${canonical}" in ;; ## Sequent Balance - ns32k-sequent-bsd4.2 ) + ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;; - ns32k-sequent-bsd4.3 ) + ns32k-sequent-bsd4.3* ) machine=sequent opsys=bsd4-3 ;; ## SONY machines - m68*-sony-bsd4.2 ) + m68*-sony-bsd4.2* ) machine=news opsys=bsd4-2 ;; - m68*-sony-bsd4.3 ) + m68*-sony-bsd4.3* ) + machine=news opsys=bsd4-3 + ;; + m68*-sony-newsos3*) machine=news opsys=bsd4-3 ;; mips-sony-bsd* ) machine=news-risc opsys=bsd4-3 ;; + mips-sony-newsos* ) + machine=mips opsys=newsos5 + ;; ## Stride m68*-stride-sysv* ) @@ -787,10 +910,19 @@ case "${canonical}" in * ) unported=true ;; esac case "${canonical}" in + ## The Sun386 didn't get past 4.0. + i386-*-sunos4 ) opsys=sunos4-0 ;; *-sunos4.0* ) opsys=sunos4-0 ;; *-sunos4.1.3* ) opsys=sunos4-1-3 ;; *-sunos4* | *-sunos ) opsys=sunos4-1 ;; - *-sunos5* | *-solaris* ) opsys=sol2 ;; + *-sunos5.3* | *-solaris2.3* ) + opsys=sol2-3 + NON_GNU_CPP=/usr/ccs/lib/cpp + ;; + *-sunos5* | *-solaris* ) + opsys=sol2 + NON_GNU_CPP=/usr/ccs/lib/cpp + ;; * ) opsys=bsd4-2 ;; esac ;; @@ -801,10 +933,10 @@ case "${canonical}" in ;; ## Tahoe machines - tahoe-tahoe-bsd4.2 ) + tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;; - tahoe-tahoe-bsd4.3 ) + tahoe-tahoe-bsd4.3* ) machine=tahoe opsys=bsd4-3 ;; @@ -814,8 +946,8 @@ case "${canonical}" in ;; ## Tektronix XD88 - m88k-tektronix-sysv3 ) - machine=tekXD88 opsys=usg5-3 + m88k-tektronix-sysv3* ) + machine=tekxd88 opsys=usg5-3 ;; ## Tektronix 16000 box (6130?) @@ -825,7 +957,7 @@ case "${canonical}" in ## Tektronix 4300 ## src/m/tek4300.h hints that this is a m68k machine. m68*-tektronix-bsd* ) - machine=tex4300 opsys=bsd4-3 + machine=tek4300 opsys=bsd4-3 ;; ## Titan P2 or P3 @@ -843,10 +975,10 @@ case "${canonical}" in vax-dec-* ) machine=vax case "${canonical}" in - *-bsd4.1 ) opsys=bsd4-1 ;; - *-bsd4.2 | *-ultrix[0-3].* | *-ultrix4.0 ) opsys=bsd4-2 ;; - *-bsd4.3 | *-ultrix* ) opsys=bsd4-3 ;; - *-bsd386 ) opsys=bsd386 ;; + *-bsd4.1* ) opsys=bsd4-1 ;; + *-bsd4.2* | *-ultrix[0-3].* | *-ultrix4.0* ) opsys=bsd4-2 ;; + *-bsd4.3* | *-ultrix* ) opsys=bsd4-3 ;; + *-bsd386* ) opsys=bsd386 ;; *-sysv[01]* | *-sysvr[01]* ) opsys=usg5-0 ;; *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;; *-vms* ) opsys=vms ;; @@ -871,7 +1003,7 @@ case "${canonical}" in machine=intel386 case "${canonical}" in *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; - *-isc2.2 ) opsys=isc2-2 ;; + *-isc2.2* ) opsys=isc2-2 ;; *-isc* ) opsys=isc3-0 ;; *-esix5* ) opsys=esix5r4 ;; *-esix* ) opsys=esix ;; @@ -879,7 +1011,9 @@ case "${canonical}" in *-linux* ) opsys=linux ;; *-sco3.2v4* ) opsys=sco4 ;; *-bsd386* ) opsys=bsd386 ;; - *-386bsd ) opsys=386bsd ;; + *-386bsd* ) opsys=386bsd ;; + *-netbsd* ) opsys=netbsd ;; + *-nextstep* ) opsys=mach2 ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac ;; @@ -905,6 +1039,9 @@ if [ x"${opsys}" = x ]; then *-sysv2.2 | *-sysvr2.2 ) opsys=usg5-2-2 ;; *-sysv3 | *-sysvr3 ) opsys=usg5-3 ;; *-sysv4 | *-sysvr4 ) opsys=usg5-4 ;; + *-sysv4.1 | *-sysvr4.1 ) + NON_GNU_CPP=/usr/lib/cpp + opsys=usg5-4 ;; *-sysv4.2 | *-sysvr4.2 ) opsys=usg5-4-2 ;; * ) unported=true @@ -928,13 +1065,40 @@ AC_CONFIG_HEADER(src/config.h) [ #### Choose a compiler. +if [ "x$CC" = x ] +then cc_specified=1 +fi + case ${with_gcc} in "yes" ) CC="gcc" GCC=1 ;; - "no" ) CC="cc" ;; + "no" ) + if [ "x$CC" = x ] + then true; + else CC=cc; + fi + ;; * ) ] AC_PROG_CC [ esac +#### Some systems specify a CPP to use unless we are using GCC. +#### Now that we know whether we are using GCC, we can decide whether +#### to use that one. +if [ "x$NON_GNU_CPP" = x ] || [ x$GCC = x1 ] || [ "x$CPP" = x ] +then true +else + CPP="$NON_GNU_CPP" +fi + +#### Some systems specify a CC to use unless we are using GCC. +#### Now that we know whether we are using GCC, we can decide whether +#### to use that one. +if [ "x$NON_GNU_CC" = x ] || [ x$GCC = x1 ] || [ x$cc_specified = x1 ] +then true +else + CC="$NON_GNU_CC" +fi + #### Some other nice autoconf tests. If you add a test here which #### should make an entry in src/config.h, don't forget to add an #### #undef clause to src/config.h.in for autoconf to modify. @@ -948,20 +1112,21 @@ AC_PROG_YACC dnl checks for UNIX variants that set `DEFS' dnl checks for header files -AC_HAVE_HEADERS(sys/timeb.h sys/time.h) +AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h) AC_STDC_HEADERS AC_TIME_WITH_SYS_TIME - -dnl checks for library files -AC_HAVE_LIBRARY(-ldnet) +dnl In Autoconf 1.8 use AC_SYS_SIGLIST_DECLARED instead of this. +AC_COMPILE_CHECK(sys_siglist declaration in signal.h or unistd.h, + [#include +/* NetBSD declares sys_siglist in . */ +#ifdef HAVE_UNISTD_H +#include +#endif], [char *msg = *(sys_siglist + 1);], + AC_DEFINE(SYS_SIGLIST_DECLARED)) dnl checks for typedefs AC_RETSIGTYPE -dnl checks for functions -AC_ALLOCA -AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir) - dnl checks for structure members AC_STRUCT_TM AC_TIMEZONE @@ -975,7 +1140,6 @@ AC_LONG_FILE_NAMES dnl other checks for UNIX variants [ - #### Choose a window system. echo "Checking window system." @@ -998,45 +1162,68 @@ case "${with_x10}" in ;; esac -### If the user hasn't specified where we should find X, try -### letting autoconf figure that out. -if [ "0${x_includes}" = 0 ] && [ "0${x_libraries}" = 0 ]; then - ] - AC_FIND_X - [ - if [ "0${x_includes}" = 0 ] && [ "0${x_libraries}" = 0 ]; then - C_SWITCH_X_SITE="-I\"${x_includes}\"" - LD_SWITCH_X_SITE="-L\"${x_libraries}\"" - fi -fi - case "${window_system}" in "none" | "x11" | "x10" ) ;; "" ) - echo " No window system specified. Looking for X11." - window_system=none - if [ -r /usr/lib/libX11.a \ + # --x-includes or --x-libraries implies --with-x11. + if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then + window_system=x11 + else + echo " No window system specified. Looking for X11." + # If the user didn't specify a window system and we found X11, use it. + if [ -r /usr/lib/libX11.a \ -o -d /usr/include/X11 \ -o -d /usr/X386/include \ -o -d ${x_includes}/X11 ]; then - window_system=x11 + window_system=x11 + fi fi ;; * ) - echo "Don't specify the window system more than once." >&2 + echo "Don't specify a window system more than once." >&2 exit 1 ;; esac +[ -z "${window_system}" ] && window_system=none + +[ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}" +[ -n "${x_libraries}" ] && LD_SWITCH_X_SITE_AUX="-R${x_libraries}" +[ -n "${x_includes}" ] && C_SWITCH_X_SITE="-I${x_includes}" + +# Avoid forcing the search of /usr/include before fixed include files. +if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then + C_SWITCH_X_SITE=" " +fi + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes HAVE_X11=yes echo " Using X11." + case "${with_x_toolkit}" in + athena | lucid ) + USE_X_TOOLKIT=LUCID + echo " Using Xt toolkit." + ;; + motif ) + USE_X_TOOLKIT=MOTIF + echo " Using Motif toolkit." + ;; + open-look ) + USE_X_TOOLKIT=OPEN_LOOK + echo " Using Open-Look toolkit." + ;; + * ) + USE_X_TOOLKIT=no + echo " Using Xlib directly." + ;; + esac ;; x10 ) HAVE_X_WINDOWS=yes HAVE_X11=no + USE_X_TOOLKIT=no echo " Using X10." ;; none ) @@ -1045,6 +1232,7 @@ case "${window_system}" in echo " Using no window system." ;; esac +X_TOOLKIT_TYPE=$USE_X_TOOLKIT ### If we're using X11, we should use the X menu package. HAVE_X_MENU=no @@ -1077,19 +1265,36 @@ echo ' #ifndef C_SWITCH_SYSTEM #define C_SWITCH_SYSTEM #endif -@configure@ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM -@configure@ c_switch_system=C_SWITCH_SYSTEM +#ifndef C_SWITCH_MACHINE +#define C_SWITCH_MACHINE +#endif +configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM +configure___ c_switch_system=C_SWITCH_SYSTEM +configure___ c_switch_machine=C_SWITCH_MACHINE + +#ifndef LIB_X11_LIB +#define LIB_X11_LIB -lX11 +#endif + +#ifndef LIBX11_MACHINE +#define LIBX11_MACHINE +#endif + +#ifndef LIBX11_SYSTEM +#define LIBX11_SYSTEM +#endif +configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM #ifdef UNEXEC -@configure@ unexec=UNEXEC +configure___ unexec=UNEXEC #else -@configure@ unexec=unexec.o +configure___ unexec=unexec.o #endif #ifdef SYSTEM_MALLOC -@configure@ system_malloc=yes +configure___ system_malloc=yes #else -@configure@ system_malloc=no +configure___ system_malloc=no #endif #ifndef C_DEBUG_SWITCH @@ -1101,17 +1306,17 @@ echo ' #endif #ifdef __GNUC__ -@configure@ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH +configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH #else -@configure@ CFLAGS=C_DEBUG_SWITCH +configure___ CFLAGS=C_DEBUG_SWITCH #endif ' > ${tempcname} # The value of CPP is a quoted variable reference, so we need to do this # to get its actual value... CPP=`eval "echo $CPP"` eval `${CPP} -Isrc ${tempcname} \ - | grep '@configure@' \ - | sed -e 's/^@configure@ \([^=]*=\)\(.*\)$/\1"\2"/'` + | grep 'configure___' \ + | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'` rm ${tempcname} ### Compute the unexec source name from the object name. @@ -1133,42 +1338,64 @@ fi LISP_FLOAT_TYPE=yes -#### Add the X libraries to the list, and check for some functions found there. -CFLAGS_save="$CFLAGS" -CFLAGS="${CFLAGS} ${LD_SWITCH_X_SITE}" +#### Add the libraries to LIBS and check for some functions. + ] -AC_HAVE_LIBRARY(-lXbsd) -[ -LIBS_save="$LIBS" -if [ "${HAVE_X11}" = "yes" ] ; then - LIBS="-lX11 ${LIBS}" +DEFS="$c_switch_system $c_switch_machine $DEFS" +LIBS="$libsrc_libs" + +dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks, +dnl and also adds -ldnet to LIBS, which Autoconf uses for checks. +AC_HAVE_LIBRARY(-ldnet) + +AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd") + +echo checking for XFree86 +if test -d /usr/X386/include; then + HAVE_XFREE386=yes + test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" +fi + +if test "${HAVE_X11}" = "yes"; then + DEFS="$C_SWITCH_X_SITE $DEFS" + LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS" + AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen XSetWMProtocols) fi -] -AC_HAVE_FUNCS(XrmSetDatabase random) -[ -CFLAGS="$CFLAGS_save" -LIBS="$LIBS_save" - -case "${window_system}:${LIBS}" in - x11:*-lXbsd* ) - if [ -d /usr/X386/include ]; then - HAVE_XFREE386=yes - if [ "${C_SWITCH_X_SITE}" = "" ]; then - C_SWITCH_X_SITE="-I/usr/X386/include" - fi - fi - ;; -esac +AC_ALLOCA + +# logb and frexp are found in -lm on most systems. +AC_HAVE_LIBRARY(-lm) +AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \ +random bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror) + +ok_so_far=true +AC_FUNC_CHECK(socket, , ok_so_far=) +if test -n "$ok_so_far"; then + AC_HEADER_CHECK(netinet/in.h, , ok_so_far=) +fi +if test -n "$ok_so_far"; then + AC_HEADER_CHECK(arpa/inet.h, , ok_so_far=) +fi +if test -n "$ok_so_far"; then + AC_DEFINE(HAVE_INET_SOCKETS) +fi +[ #### Find out which version of Emacs this is. version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ - | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'` + | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)[."].*$/\1/'` if [ x"${version}" = x ]; then echo "${progname}: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&2 exit 1 fi +if [ -f /usr/lpp/X11/bin/smt.exp ]; then + ] + AC_DEFINE(HAVE_AIX_SMT_EXP) + [ +fi + #### Specify what sort of things we'll be editing into Makefile and config.h. ### Use configuration here uncanonicalized to avoid exceeding size limits. @@ -1176,19 +1403,34 @@ fi AC_SUBST(configuration) AC_SUBST(version) AC_SUBST(srcdir) +AC_SUBST(prefix) +AC_SUBST(exec_prefix) +AC_SUBST(bindir) +AC_SUBST(datadir) +AC_SUBST(statedir) +AC_SUBST(libdir) +AC_SUBST(mandir) +AC_SUBST(infodir) +AC_SUBST(lispdir) +AC_SUBST(locallisppath) +AC_SUBST(lisppath) +AC_SUBST(etcdir) +AC_SUBST(lockdir) +AC_SUBST(archlibdir) +AC_SUBST(docdir) AC_SUBST(c_switch_system) +AC_SUBST(c_switch_machine) AC_SUBST(libsrc_libs) -AC_SUBST(rip_paths) -AC_SUBST(inst_paths) AC_SUBST(LD_SWITCH_X_SITE) +AC_SUBST(LD_SWITCH_X_SITE_AUX) AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(CFLAGS) -AC_SUBST(prefix) -AC_SUBST(exec_prefix) +AC_SUBST(X_TOOLKIT_TYPE) AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"") AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"") AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}) +AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX}) AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}) AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC}) @@ -1196,6 +1438,9 @@ AC_DEFINE_UNQUOTED(UNEXEC_SRC, ${UNEXEC_SRC}) if [ "${HAVE_X_WINDOWS}" = "yes" ] ; then ] AC_DEFINE(HAVE_X_WINDOWS) [ fi +if [ "${USE_X_TOOLKIT}" != "no" ] ; then + ] AC_DEFINE(USE_X_TOOLKIT) [ +fi if [ "${HAVE_X11}" = "yes" ] ; then ] AC_DEFINE(HAVE_X11) [ fi @@ -1215,6 +1460,57 @@ if [ "${LISP_FLOAT_TYPE}" = "yes" ] ; then ] AC_DEFINE(LISP_FLOAT_TYPE) [ fi +# ====================== Developer's configuration ======================= + +# The following assignments make sense if you're running Emacs on a single +# machine, one version at a time, and you want changes to the lisp and etc +# directories in the source tree to show up immediately in your working +# environment. It saves a great deal of disk space by not duplicating the +# lisp and etc directories. + +if [ "$run_in_place" = "1" ]; then + lispdir='${srcdir}/lisp' + locallisppath='${srcdir}/site-lisp' + etcdir='${srcdir}/etc' + lockdir='${srcdir}/lock' + archlibdir=`(cd lib-src && pwd)` + docdir=`(cd etc && pwd)` + infodir='${srcdir}/info' +elif [ "$single_tree" = "1" ]; then + if [ "$exec_prefix_specified" = "" ]; then + exec_prefix='${prefix}' + fi + if [ "$bindir_specified" = "" ]; then + bindir='${exec_prefix}/bin/${configuration}' + fi + if [ "$datadir_specified" = "" ]; then + datadir='${prefix}/common' + fi + if [ "$statedir_specified" = "" ]; then + statedir='${prefix}/common' + fi + if [ "$libdir_specified" = "" ]; then + libdir='${bindir}' + fi + if [ "$lispdir_specified" = "" ]; then + lispdir='${prefix}/common/lisp' + fi + if [ "$locallisppath_specified" = "" ]; then + locallisppath='${prefix}/common/site-lisp' + fi + if [ "$lockdir_specified" = "" ]; then + lockdir='${prefix}/common/lock' + fi + if [ "$archlibdir_specified" = "" ]; then + archlibdir='${libdir}/etc' + fi + if [ "$etcdir_specified" = "" ]; then + etcdir='${prefix}/common/data' + fi + if [ "$docdir_specified" = "" ]; then + docdir='${prefix}/common/data' + fi +fi #### Report on what we decided to do. echo " @@ -1232,5 +1528,40 @@ Configured for \`${canonical}'. Where do we find X Windows libraries? }${x_libraries} " + +# Remove any trailing slashes in these variables. +test -n "${prefix}" && + prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` +test -n "${exec_prefix}" && + exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` ] -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [ +# Build src/Makefile from ${srcdir}/src/Makefile.in. This must be done +# after src/config.h is built, since we rely on that file. + +changequote(,)dnl The horror, the horror. +# Now get this: Some word that is part of the ${srcdir} directory name +# or the ${configuration} value might, just might, happen to be an +# identifier like `sun4' or `i386' or something, and be predefined by +# the C preprocessor to some helpful value like 1, or maybe the empty +# string. Needless to say consequent macro substitutions are less +# than conducive to the makefile finding the correct directory. +undefs="`echo $top_srcdir $configuration | +sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/ */ -U/g' \ + -e 's/ -U$//' -e 's/^[^ ]/-U/' \ + -e 's/-U[0-9][^ ]*//g' \ +`" +changequote([,])dnl + +echo creating src/Makefile +( cd src + rm -f junk.c + sed -e 's@^# \(Generated.*\)$@/* \1 */@' \ + -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ + < Makefile.in > junk.c + $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new + rm -f junk.c + chmod 444 Makefile.new; + mv -f Makefile.new Makefile; +)])