X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d2ebfa8cfcd82cc5fe38793313a20a3bac991036..c3fd8dd5523f6a823fe79e4222c3073a17eb96dc:/configure1.in diff --git a/configure1.in b/configure1.in index 4d64bcfab6..6e4cf079a2 100755 --- a/configure1.in +++ b/configure1.in @@ -1,21 +1,18 @@ 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.7 or later. -dnl -dnl The following text appears in the resulting `configure' script, -dnl explaining how to rebuild it. +dnl in the directory containing this script. [#!/bin/sh #### Configuration script for GNU Emacs #### Copyright (C) 1992, 1994 Free Software Foundation, Inc. +#### This script requires autoconf version 1.9 or later. ### 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.7 or later. +### in the this directory. ### This file is part of GNU Emacs. @@ -68,17 +65,17 @@ single_tree= prefix='/usr/local' exec_prefix='${prefix}' bindir='${exec_prefix}/bin' -datadir='${prefix}/lib' -statedir='${prefix}/lib' -libdir='${exec_prefix}/lib' +datadir='${prefix}/share' +sharedstatedir='${prefix}/com' +libexecdir='${exec_prefix}/libexec' 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}' +lockdir='${sharedstatedir}/emacs/lock' +archlibdir='${libexecdir}/emacs/${version}/${configuration}' docdir='${datadir}/emacs/${version}/etc' # On Sun systems, people sometimes set up the variable CPP @@ -92,8 +89,8 @@ 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="prefix | exec_prefix | bindir | libexecdir | etcdir | datadir" +# path_options="$path_options | archlibdir | sharedstatedir | mandir | infodir" # path_options="$path_options | lispdir | lockdir | lisppath | locallisppath" #### Usage messages. @@ -104,7 +101,10 @@ 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. ---with-x-toolkit Use an X toolkit. +--with-x-toolkit=yes Use the X toolkit. Default to Lucid/Athena widgets. +--with-x-toolkit=athena Use the X toolkit with Athena widgets. +--with-x-toolkit=lucid Use the X toolkit with Lucid widgets. +--with-x-toolkit=motif Use the X toolkit with Motif widgets. --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. @@ -124,7 +124,7 @@ CONFIGURATION specifies the machine and operating system to build for. --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 +including --bindir, --libexecdir, --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 @@ -150,6 +150,7 @@ done ### 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. +config_options="$*" while [ $# != 0 ]; do arg="$1"; shift case "${arg}" in @@ -167,7 +168,7 @@ while [ $# != 0 ]; do ## If FOO is a boolean argument, --FOO is equivalent to ## --FOO=yes. Otherwise, the value comes from the next ## argument - see below. - opt=`echo ${arg} | sed 's:^-*\(.*\)$:\1:'` + opt=`echo ${arg} | sed 's:^-*::'` val="yes" valomitted=yes ;; @@ -203,8 +204,8 @@ Set it to either \`yes' or \`no'." 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 ;; # These don't currently work. -# m | mo | mot | moti | motif ) val=motif ;; # o | op | ope | open | open- | open-l | open-lo \ # | open-loo | open-look ) val=open-look ;; * ) @@ -212,7 +213,8 @@ Set it to either \`yes' or \`no'." #echo "${progname}: the \`--${optname}' option is supposed to have a value #which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'." echo "${progname}: the \`--${optname}' option is supposed to have a value -which is \`yes', \`no', \`lucid', or \`athena'." +which is \`yes', \`no', \`lucid', \`athena', or \`motif'. +Currently, \`yes', \`athena' and \`lucid' are synonyms." echo "${short_usage}") >&2 exit 1 ;; @@ -285,21 +287,21 @@ Set it to either \`yes' or \`no'." x_libraries="${val}" ;; - ## Should this use the "development configuration"? + ## Should this use the "development" file organization? "run_in_place" ) single_tree= run_in_place=1 ;; - ## Should this use the "single tree" configuration? + ## Should this use the "single tree" file organization? "single_tree" ) run_in_place= single_tree=1 ;; ## Has the user specified one of the path options? - prefix | exec_prefix | bindir | libdir | etcdir | datadir | \ - archlibdir | statedir | mandir | infodir | lispdir | lockdir | \ + prefix | exec_prefix | bindir | libexecdir | etcdir | datadir | \ + archlibdir | sharedstatedir | mandir | infodir | lispdir | lockdir | \ lisppath | locallisppath | docdir ) ## If the value was omitted, get it from the next argument. if [ "${valomitted}" = "yes" ]; then @@ -422,6 +424,9 @@ case "${srcdir}" in * ) srcdir="`(cd ${srcdir}; pwd)`" ;; esac +### Remove trailing slashes. +srcdir=`echo "${srcdir}" | sed 's,\([^/]\)/*$,\1,'` + #### Check if the source directory already has a configured system in it. if [ `pwd` != `(cd ${srcdir} && pwd)` ] \ && [ -f "${srcdir}/src/config.h" ] ; then @@ -451,7 +456,7 @@ done #### names of the m/*.h and s/*.h files we should use. ### Canonicalize the configuration name. -echo "Checking the configuration name." +echo "Checking the configuration name" if canonical=`${srcdir}/config.sub "${configuration}"` ; then : ; else exit $? fi @@ -482,6 +487,28 @@ fi machine='' opsys='' unported='false' case "${canonical}" in + ## NetBSD ports + *-*-netbsd* ) + opsys=netbsd + case "${canonical}" in + i[345]86-*-netbsd*) machine=intel386 ;; + m68k-*-netbsd*) + # This is somewhat bogus. + machine=hp9000s300 ;; + mips-*-netbsd*) machine=pmax ;; + ns32k-*-netbsd*) machine=ns32000 ;; + sparc-*-netbsd*) machine=sparc ;; + esac + ;; + + ## Acorn RISCiX: + arm-acorn-riscix1.1* ) + machine=acorn opsys=riscix1-1 + ;; + arm-acorn-riscix1.2* | arm-acorn-riscix ) + machine=acorn opsys=riscix1-2 + ;; + ## Alliant machines ## Strictly speaking, we need the version of the alliant operating ## system to choose the right machine file, but currently the @@ -495,6 +522,10 @@ case "${canonical}" in machine=alliant-2800 opsys=bsd4-3 ;; + alpha-dec-osf* ) + machine=alpha opsys=osf1 + ;; + ## Altos 3068 m68*-altos-sysv* ) machine=altos opsys=usg5-2 @@ -555,12 +586,14 @@ case "${canonical}" in ;; ## Convex - *-convex-bsd* ) + *-convex-bsd* | *-convex-convexos* ) machine=convex opsys=bsd4-3 + ## Prevents suprious white space in makefiles - d.m.cooke@larc.nasa.gov + NON_GNU_CPP="cc -E -P" ;; ## Cubix QBx/386 - i386-cubix-sysv* ) + i[345]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;; @@ -570,6 +603,12 @@ case "${canonical}" in ;; ## Data General AViiON Machines + m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) + machine=aviion opsys=dgux5-4r3 + ;; + m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) + machine=aviion opsys=dgux5-4r2 + ;; m88k-dg-dgux* ) machine=aviion opsys=dgux ;; @@ -658,9 +697,6 @@ 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 @@ -675,13 +711,16 @@ case "${canonical}" in ## HP 9000 series 700 and 800, running HP/UX hppa*-hp-hpux7* ) - machine=hp9000s800 opsys=hpux + machine=hp800 opsys=hpux ;; hppa*-hp-hpux8* ) - machine=hp9000s800 opsys=hpux8 + machine=hp800 opsys=hpux8 + ;; + hppa*-hp-hpux9shr* ) + machine=hp800 opsys=hpux9shr ;; hppa*-hp-hpux9* ) - machine=hp9000s800 opsys=hpux9 + machine=hp800 opsys=hpux9 ;; ## HP 9000 series 700 and 800, running HP/UX @@ -690,10 +729,10 @@ case "${canonical}" in 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 ;; + *.B8.* ) machine=hp800 opsys=hpux8 ;; + *.08.* ) machine=hp800 opsys=hpux8 ;; + *.09.* ) machine=hp800 opsys=hpux9 ;; + *) machine=hp800 opsys=hpux ;; esac ;; @@ -706,22 +745,22 @@ case "${canonical}" in ;; ## IBM machines - i386-ibm-aix1.1* ) + i[345]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;; - i386-ibm-aix1.[23]* | i386-ibm-aix* ) + i[345]86-ibm-aix1.[23]* | i[345]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;; i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;; - rs6000-ibm-aix3.1* ) + rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1* ) machine=ibmrs6000 opsys=aix3-1 ;; - rs6000-ibm-aix3.2.5) + rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 ) machine=ibmrs6000 opsys=aix3-2-5 ;; - rs6000-ibm-aix3.2* | rs6000-ibm-aix* ) + rs6000-ibm-aix* | powerpc-ibm-aix* ) machine=ibmrs6000 opsys=aix3-2 ;; romp-ibm-bsd4.3* ) @@ -755,47 +794,38 @@ case "${canonical}" in ;; ## Intel 386 machines where we do care about the manufacturer - i[34]86-intsys-sysv* ) + i[345]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;; ## Prime EXL - i386-prime-sysv* ) + i[345]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;; - ## Sequent Symmetry - i386-sequent-bsd* ) + ## Sequent Symmetry running Dynix + i[345]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;; - ## Unspecified sysv on an ncr machine defaults to svr4. - i[34]86-ncr-sysv* ) - machine=intel386 opsys=usg5-4 + ## Sequent Symmetry running DYNIX/ptx + ## Use the old cpp rather than the newer ANSI one. + i[345]86-sequent-ptx* ) + machine=sequent-ptx opsys=ptx + NON_GNU_CPP="/lib/cpp" + ;; + + ## Unspecified sysv on an ncr machine defaults to svr4.2. + ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.) + i[345]86-ncr-sysv* ) + machine=intel386 opsys=usg5-4-2 ;; ## Intel 860 i860-*-sysv4* ) machine=i860 opsys=usg5-4 - ;; - - ## Silicon Graphics machines - ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) - m68*-sgi-iris3.5* ) - machine=irist opsys=iris3-5 - ;; - m68*-sgi-iris3.6* | m68*-sgi-iris*) - machine=irist opsys=iris3-6 - ;; - ## Iris 4D - mips-sgi-irix3.* ) - machine=iris4d opsys=irix3-3 - ;; - mips-sgi-irix5.* ) - machine=iris4d opsys=irix5-0 - ;; - mips-sgi-irix4.* | mips-sgi-irix* ) - machine=iris4d opsys=irix4-0 + NON_GNU_CC="/bin/cc" # Ie, not the one in /usr/ucb/cc. + NON_GNU_CPP="/usr/ccs/lib/cpp" # cc -E tokenizes macro expansion. ;; ## Masscomp machines @@ -836,7 +866,7 @@ case "${canonical}" in ;; ## NeXT - m68*-next-* ) + m68*-next-* | i[345]86-next-* ) machine=next opsys=mach2 ;; @@ -883,6 +913,32 @@ case "${canonical}" in machine=sequent opsys=bsd4-3 ;; + ## Siemens Nixdorf + mips-siemens-sysv* ) + machine=mips-siemens opsys=usg5-4 + NON_GNU_CC=/usr/ccs/bin/cc + NON_GNU_CPP=/usr/ccs/lib/cpp + ;; + + ## Silicon Graphics machines + ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) + m68*-sgi-iris3.5* ) + machine=irist opsys=iris3-5 + ;; + m68*-sgi-iris3.6* | m68*-sgi-iris*) + machine=irist opsys=iris3-6 + ;; + ## Iris 4D + mips-sgi-irix3* ) + machine=iris4d opsys=irix3-3 + ;; + mips-sgi-irix5* ) + machine=iris4d opsys=irix5-0 + ;; + mips-sgi-irix4* | mips-sgi-irix* ) + machine=iris4d opsys=irix4-0 + ;; + ## SONY machines m68*-sony-bsd4.2* ) machine=news opsys=bsd4-2 @@ -893,11 +949,11 @@ case "${canonical}" in m68*-sony-newsos3*) machine=news opsys=bsd4-3 ;; - mips-sony-bsd* ) + mips-sony-bsd* | mips-sony-newsos4* ) machine=news-risc opsys=bsd4-3 ;; mips-sony-newsos* ) - machine=mips opsys=newsos5 + machine=news-risc opsys=newsos5 ;; ## Stride @@ -906,25 +962,37 @@ case "${canonical}" in ;; ## Suns - *-sun-sunos* | *-sun-bsd* | *-sun-solaris* ) + *-sun-sunos* | *-sun-bsd* | *-sun-solaris* | i[345]86-*-solaris2* | i[345]86-*-sunos5* ) case "${canonical}" in m68*-sunos1* ) machine=sun1 ;; m68*-sunos2* ) machine=sun2 ;; m68* ) machine=sun3 ;; - i[34]86* ) machine=sun386 ;; + i[345]86-sun-sunos[34]* ) machine=sun386 ;; + i[345]86-*-* ) machine=intel386 ;; sparc* ) machine=sparc ;; * ) unported=true ;; esac case "${canonical}" in ## The Sun386 didn't get past 4.0. - i386-*-sunos4 ) opsys=sunos4-0 ;; + i[345]86-*-sunos4 ) opsys=sunos4-0 ;; *-sunos4.0* ) opsys=sunos4-0 ;; - *-sunos4.1.3* ) opsys=sunos4-1-3 ;; - *-sunos4* | *-sunos ) opsys=sunos4-1 ;; + *-sunos4.1.3* ) opsys=sunos4-1-3 + NON_GCC_TEST_OPTIONS=-Bstatic + GCC_TEST_OPTIONS=-static + ;; + *-sunos4shr* ) opsys=sunos4shr ;; + *-sunos4* | *-sunos ) opsys=sunos4-1 + NON_GCC_TEST_OPTIONS=-Bstatic + GCC_TEST_OPTIONS=-static + ;; *-sunos5.3* | *-solaris2.3* ) opsys=sol2-3 NON_GNU_CPP=/usr/ccs/lib/cpp ;; + *-sunos5.4* | *-solaris2.4* ) + opsys=sol2-4 + NON_GNU_CPP=/usr/ccs/lib/cpp + ;; *-sunos5* | *-solaris* ) opsys=sol2 NON_GNU_CPP=/usr/ccs/lib/cpp @@ -984,7 +1052,7 @@ 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 ;; + *-bsd386* | *-bsdi* ) opsys=bsd386 ;; *-sysv[01]* | *-sysvr[01]* ) opsys=usg5-0 ;; *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;; *-vms* ) opsys=vms ;; @@ -1005,20 +1073,21 @@ case "${canonical}" in ;; ## Intel 386 machines where we don't care about the manufacturer - i[34]86-*-* ) + i[345]86-*-* ) machine=intel386 case "${canonical}" in *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; *-isc2.2* ) opsys=isc2-2 ;; + *-isc4.0* ) opsys=isc4-0 ;; *-isc* ) opsys=isc3-0 ;; - *-esix5* ) opsys=esix5r4 ;; + *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;; *-esix* ) opsys=esix ;; *-xenix* ) opsys=xenix ;; *-linux* ) opsys=linux ;; - *-sco3.2v4* ) opsys=sco4 ;; - *-bsd386* ) opsys=bsd386 ;; + *-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;; + *-bsd386* | *-bsdi* ) opsys=bsd386 ;; *-386bsd* ) opsys=386bsd ;; - *-netbsd* ) opsys=netbsd ;; + *-freebsd* ) opsys=freebsd ;; *-nextstep* ) opsys=mach2 ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac @@ -1037,9 +1106,10 @@ esac ### above. if [ x"${opsys}" = x ]; then case "${canonical}" in - *-bsd4.[01] ) opsys=bsd4-1 ;; - *-bsd4.2 ) opsys=bsd4-2 ;; - *-bsd4.3 ) opsys=bsd4-3 ;; + *-gnu* ) opsys=gnu ;; + *-bsd4.[01] ) opsys=bsd4-1 ;; + *-bsd4.2 ) opsys=bsd4-2 ;; + *-bsd4.3 ) opsys=bsd4-3 ;; *-sysv0 | *-sysvr0 ) opsys=usg5-0 ;; *-sysv2 | *-sysvr2 ) opsys=usg5-2 ;; *-sysv2.2 | *-sysvr2.2 ) opsys=usg5-2-2 ;; @@ -1072,15 +1142,16 @@ AC_CONFIG_HEADER(src/config.h) #### Choose a compiler. if [ "x$CC" = x ] -then cc_specified=1 +then true +else cc_specified=1 fi case ${with_gcc} in "yes" ) CC="gcc" GCC=1 ;; "no" ) if [ "x$CC" = x ] - then true; - else CC=cc; + then CC=cc; + else true; fi ;; * ) @@ -1090,7 +1161,7 @@ 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 ] +if [ "x$NON_GNU_CPP" = x ] || [ x$GCC = x1 ] || [ "x$CPP" != x ] then true else CPP="$NON_GNU_CPP" @@ -1105,6 +1176,16 @@ else CC="$NON_GNU_CC" fi +if [ x$GCC = x1 ] && [ "x$GCC_TEST_OPTIONS" != x ] +then + CC="$CC $GCC_TEST_OPTIONS" +fi + +if [ x$GCC = x ] && [ "x$NON_GCC_TEST_OPTIONS" != x ] +then + CC="$CC $NON_GCC_TEST_OPTIONS" +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. @@ -1116,9 +1197,10 @@ AC_PROG_INSTALL AC_PROG_YACC dnl checks for UNIX variants that set `DEFS' +AC_AIX dnl checks for header files -AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h) +AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h utime.h) AC_STDC_HEADERS AC_TIME_WITH_SYS_TIME dnl In Autoconf 1.8 use AC_SYS_SIGLIST_DECLARED instead of this. @@ -1129,9 +1211,35 @@ AC_COMPILE_CHECK(sys_siglist declaration in signal.h or unistd.h, #include #endif], [char *msg = *(sys_siglist + 1);], AC_DEFINE(SYS_SIGLIST_DECLARED)) +dnl Some systems have utime.h but don't declare the struct anyplace. +AC_COMPILE_CHECK(struct utimbuf, [#ifdef TIME_WITH_SYS_TIME +#include +#include +#else +#ifdef HAVE_SYS_TIME_H +#include +#else +#include +#endif +#endif +#ifdef HAVE_UTIME_H +#include +#endif], [static struct utimbuf x; x.actime = x.modtime;], + AC_DEFINE(HAVE_STRUCT_UTIMBUF)) dnl checks for typedefs AC_RETSIGTYPE +AC_COMPILE_CHECK(struct timeval, [#ifdef TIME_WITH_SYS_TIME +#include +#include +#else +#ifdef HAVE_SYS_TIME_H +#include +#else +#include +#endif +#endif], [static struct timeval x; x.tv_sec = x.tv_usec;], + AC_DEFINE(HAVE_TIMEVAL)) dnl checks for structure members AC_STRUCT_TM @@ -1140,6 +1248,9 @@ AC_TIMEZONE dnl checks for compiler characteristics AC_CONST +dnl check for Make feature +AC_SET_MAKE + dnl checks for operating system services AC_LONG_FILE_NAMES @@ -1147,7 +1258,7 @@ dnl other checks for UNIX variants [ #### Choose a window system. -echo "Checking window system." +echo "checking for specified window system" window_system='' case "${with_x}" in @@ -1156,15 +1267,28 @@ case "${with_x}" in ;; no ) window_system=${window_system}none -esac -case "${with_x11}" in - yes ) - window_system=${window_system}x11 ;; esac -case "${with_x10}" in - yes ) - window_system=${window_system}x10 +case "${window_system}" in + .* ) + ;; + * ) + case "${with_x11}" in + yes ) + window_system=x11 + ;; + no ) + window_system=none + ;; + esac + case "${with_x10}" in + yes ) + window_system=x10 + ;; + no ) + window_system=none + ;; + esac ;; esac @@ -1191,12 +1315,33 @@ case "${window_system}" in ;; esac +case "${window_system}" in + "" | "x11" ) + ### If the user hasn't specified where we should find X, try + ### letting autoconf figure that out. + if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then + ] + AC_FIND_X + [ + fi + if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then + window_system=x11 + fi + ;; +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}" +if [ x"${x_includes}" = x ]; then + bitmapdir=/usr/include/X11/bitmaps; +else + bitmapdir="${x_includes}/bitmaps"; +fi + # Avoid forcing the search of /usr/include before fixed include files. if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then C_SWITCH_X_SITE=" " @@ -1221,7 +1366,7 @@ case "${window_system}" in echo " Using Open-Look toolkit." ;; * ) - USE_X_TOOLKIT=no + USE_X_TOOLKIT=none echo " Using Xlib directly." ;; esac @@ -1229,12 +1374,13 @@ case "${window_system}" in x10 ) HAVE_X_WINDOWS=yes HAVE_X11=no - USE_X_TOOLKIT=no + USE_X_TOOLKIT=none echo " Using X10." ;; none ) HAVE_X_WINDOWS=no HAVE_X11=no + USE_X_TOOLKIT=none echo " Using no window system." ;; esac @@ -1250,9 +1396,19 @@ esac #### Extract some information from the operating system and machine files. -echo "Examining the machine- and system-dependent files to find out" +echo "examining the machine- and system-dependent files to find out" echo " - which libraries the lib-src programs will want, and" -echo " - whether the GNU malloc routines are usable." +echo " - whether the GNU malloc routines are usable" + +### First figure out CFLAGS (which we use for running the compiler here) +### and REAL_CFLAGS (which we use for real compilation). +### The two are the same except on a few systems, where they are made +### different to work around various lossages. For example, +### GCC 2.5 on Linux needs them to be different because it treats -g +### as implying static linking. + +### If the CFLAGS env var is specified, we use that value +### instead of the default. ### It's not important that this name contain the PID; you can't run ### two configures in the same directory and have anything work @@ -1311,11 +1467,25 @@ configure___ system_malloc=no #define C_OPTIMIZE_SWITCH -O #endif +#ifdef THIS_IS_CONFIGURE + +/* Get the CFLAGS for tests in configure. */ +#ifdef __GNUC__ +configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' +#else +configure___ CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' +#endif + +#else /* not THIS_IS_CONFIGURE */ + +/* Get the CFLAGS for real compilation. */ #ifdef __GNUC__ -configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH +configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' #else -configure___ CFLAGS=C_DEBUG_SWITCH +configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' #endif + +#endif /* not THIS_IS_CONFIGURE */ ' > ${tempcname} # The value of CPP is a quoted variable reference, so we need to do this # to get its actual value... @@ -1323,6 +1493,13 @@ CPP=`eval "echo $CPP"` eval `${CPP} -Isrc ${tempcname} \ | grep 'configure___' \ | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'` +if [ "x$CFLAGS" = x ]; then + eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \ + | grep 'configure___' \ + | sed -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/'` +else + REAL_CFLAGS="$CFLAGS" +fi rm ${tempcname} ### Compute the unexec source name from the object name. @@ -1353,6 +1530,9 @@ 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) +dnl This causes -lresolv to get used in subsequent tests, +dnl which causes failures on some systems such as HPUX 9. +dnl AC_HAVE_LIBRARY(-lresolv) AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd") @@ -1362,18 +1542,47 @@ if test -d /usr/X386/include; then test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" fi +# We change CFLAGS temporarily so that C_SWITCH_X_SITE gets used +# for the tests that follow. + 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) + CFLAGS="$C_SWITCH_X_SITE $CFLAGS" + AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString \ +XScreenNumberOfScreen XSetWMProtocols) +fi + +if test "${USE_X_TOOLKIT}" != "none"; then + AC_COMPILE_CHECK(X11 toolkit version, + [#include ], + [ +#if XtSpecificationRelease < 6 +fail; +#endif +], + AC_DEFINE(HAVE_X11XTR6)) fi +# If netdb.h doesn't declare h_errno, we must declare it by hand. +AC_COMPILE_CHECK(declaration of h_errno in netdb.h, + [#include ], + [ +int +foo () +{ + return h_errno; +} +], + AC_DEFINE(HAVE_H_ERRNO)) + 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) +random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \ +strerror fpathconf select mktime eaccess getpagesize) ok_so_far=true AC_FUNC_CHECK(socket, , ok_so_far=) @@ -1386,10 +1595,14 @@ fi if test -n "$ok_so_far"; then AC_DEFINE(HAVE_INET_SOCKETS) fi + +# Set up the CFLAGS for real compilation, so we can substitute it. +CFLAGS="$REAL_CFLAGS" + [ #### 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/^[^"]*"\([^"]*\)".*$/\1/'` if [ x"${version}" = x ]; then echo "${progname}: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&2 @@ -1402,19 +1615,19 @@ if [ -f /usr/lpp/X11/bin/smt.exp ]; then [ fi - #### Specify what sort of things we'll be editing into Makefile and config.h. ### Use configuration here uncanonicalized to avoid exceeding size limits. ] -AC_SUBST(configuration) AC_SUBST(version) +AC_SUBST(configuration) +AC_SUBST(canonical) AC_SUBST(srcdir) AC_SUBST(prefix) AC_SUBST(exec_prefix) AC_SUBST(bindir) AC_SUBST(datadir) -AC_SUBST(statedir) -AC_SUBST(libdir) +AC_SUBST(sharedstatedir) +AC_SUBST(libexecdir) AC_SUBST(mandir) AC_SUBST(infodir) AC_SUBST(lispdir) @@ -1424,15 +1637,19 @@ AC_SUBST(etcdir) AC_SUBST(lockdir) AC_SUBST(archlibdir) AC_SUBST(docdir) +AC_SUBST(bitmapdir) AC_SUBST(c_switch_system) AC_SUBST(c_switch_machine) -AC_SUBST(libsrc_libs) AC_SUBST(LD_SWITCH_X_SITE) AC_SUBST(LD_SWITCH_X_SITE_AUX) AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(CFLAGS) AC_SUBST(X_TOOLKIT_TYPE) +AC_SUBST(machfile) +AC_SUBST(opsysfile) +AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "\"${canonical}\"") +AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "\"${config_options}\"") AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"") AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"") AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}) @@ -1444,7 +1661,7 @@ 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 +if [ "${USE_X_TOOLKIT}" != "none" ] ; then ] AC_DEFINE(USE_X_TOOLKIT) [ fi if [ "${HAVE_X11}" = "yes" ] ; then @@ -1479,8 +1696,10 @@ if [ "$run_in_place" = "1" ]; then locallisppath='${srcdir}/site-lisp' etcdir='${srcdir}/etc' lockdir='${srcdir}/lock' - archlibdir=`(cd lib-src && pwd)` - docdir=`(cd etc && pwd)` + # We used to make archlibdir and docdir absolute, + # but that caused trouble with automounters. + archlibdir='${srcdir}/lib-src' + docdir='${srcdir}/etc' infodir='${srcdir}/info' elif [ "$single_tree" = "1" ]; then if [ "$exec_prefix_specified" = "" ]; then @@ -1492,11 +1711,11 @@ elif [ "$single_tree" = "1" ]; then if [ "$datadir_specified" = "" ]; then datadir='${prefix}/common' fi - if [ "$statedir_specified" = "" ]; then - statedir='${prefix}/common' + if [ "$sharedstatedir_specified" = "" ]; then + sharedstatedir='${prefix}/common' fi - if [ "$libdir_specified" = "" ]; then - libdir='${bindir}' + if [ "$libexecdir_specified" = "" ]; then + libexecdir='${bindir}' fi if [ "$lispdir_specified" = "" ]; then lispdir='${prefix}/common/lisp' @@ -1508,7 +1727,7 @@ elif [ "$single_tree" = "1" ]; then lockdir='${prefix}/common/lock' fi if [ "$archlibdir_specified" = "" ]; then - archlibdir='${libdir}/etc' + archlibdir='${libexecdir}/etc' fi if [ "$etcdir_specified" = "" ]; then etcdir='${prefix}/common/data' @@ -1529,7 +1748,8 @@ Configured for \`${canonical}'. What compiler should emacs be built with? ${CC} ${CFLAGS} Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} Should Emacs use the relocating allocator for buffers? ${REL_ALLOC} - What window system should Emacs use? ${window_system}${x_includes+ + What window system should Emacs use? ${window_system} + What toolkit should Emacs use? ${USE_X_TOOLKIT}${x_includes+ Where do we find X Windows header files? }${x_includes}${x_libraries+ Where do we find X Windows libraries? }${x_libraries} @@ -1541,7 +1761,8 @@ test -n "${prefix}" && test -n "${exec_prefix}" && exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` ] -AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [ +AC_OUTPUT(Makefile lib-src/Makefile.in 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. @@ -1552,22 +1773,40 @@ changequote(,)dnl The horror, the horror. # 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' \ +undefs="`echo $top_srcdir $configuration $canonical | +sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ + -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \ `" changequote([,])dnl +echo creating lib-src/Makefile +( cd lib-src + rm -f junk.c junk1.c junk2.c + sed -e '/start of cpp stuff/q' \ + < Makefile.in > junk1.c + sed -e '1,/start of cpp stuff/d'\ + -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ + < Makefile.in > junk.c + $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c + chmod 444 Makefile.new + mv -f Makefile.new Makefile +) + echo creating src/Makefile ( cd src - rm -f junk.c - sed -e 's@^# \(Generated.*\)$@/* \1 */@' \ + rm -f junk.c junk1.c junk2.c + sed -e '/start of cpp stuff/q' \ + < Makefile.in > junk1.c + sed -e '1,/start of cpp stuff/d'\ -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; + $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c + chmod 444 Makefile.new + mv -f Makefile.new Makefile )])