X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5f8c8f0056dff5812f62477ebc7b514d93663e24..5fd72a24746744fd09c9224715cdd1bc4b4572a3:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index 329b01b81e..d491373875 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,8 @@ AC_INIT(src/lisp.h) AC_CONFIG_HEADER(src/config.h:src/config.in) lispdir='${datadir}/emacs/${version}/lisp' -locallisppath='${datadir}/emacs/site-lisp' +locallisppath='${datadir}/emacs/${version}/site-lisp:'\ +'${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${lispdir}' etcdir='${datadir}/emacs/${version}/etc' lockdir='${sharedstatedir}/emacs/lock' @@ -34,7 +35,7 @@ AC_ARG_WITH(x-toolkit, y | ye | yes ) val=athena ;; n | no ) val=no ;; l | lu | luc | luci | lucid ) val=lucid ;; - a | at | ath | athe | athena ) val=athena ;; + a | at | ath | athe | athen | athena ) val=athena ;; m | mo | mot | moti | motif ) val=motif ;; dnl These don't currently work. dnl o | op | ope | open | open- | open-l | open-lo \ @@ -42,8 +43,8 @@ dnl | open-loo | open-look ) val=open-look ;; * ) dnl AC_MSG_ERROR([the \`--with-x-toolkit' option is supposed to have a value dnl which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'.]) -AC_MSG_ERROR([the \`--with-x-toolkit' option is supposed to have a value -which is \`yes', \`no', \`lucid', \`athena', or \`motif'. +AC_MSG_ERROR([\`--with-x-toolkit=$withval' is invalid\; +this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'. Currently, \`yes', \`athena' and \`lucid' are synonyms.]) ;; esac @@ -164,15 +165,20 @@ case "${canonical}" in machine=alliant-2800 opsys=bsd4-3 ;; + ## Alpha (DEC) machines. alpha-dec-osf* ) machine=alpha opsys=osf1 ;; + alpha-*-linux* ) + machine=alpha opsys=linux + ;; + ## Altos 3068 m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;; - + ## Amdahl UTS 580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 @@ -230,7 +236,7 @@ case "${canonical}" in ## Convex *-convex-bsd* | *-convex-convexos* ) machine=convex opsys=bsd4-3 - ## Prevents suprious white space in makefiles - d.m.cooke@larc.nasa.gov + ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov NON_GNU_CPP="cc -E -P" ;; @@ -280,7 +286,7 @@ case "${canonical}" in if test -s /etc/167config then CC="gnucc -m68040" else CC="gnucc -m68881" - fi + fi else if test -z "`type gcc | grep 'not found'`" then CC=gcc @@ -338,11 +344,17 @@ case "${canonical}" in [56].[0-9] ) machine=nh4000 opsys=cxux ;; [7].[0-9] ) machine=nh4000 opsys=cxux7 ;; esac + NON_GNU_CPP="/lib/cpp" ;; ## Harris ecx or gcx running CX/UX (Series 1200, Series 3000) m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;; + ## Harris power pc NightHawk running Power UNIX (Series 6000) + powerpc-harris-powerunix ) + machine=nh6000 opsys=powerunix + NON_GNU_CPP="cc -Xo -E -P" + ;; ## Honeywell XPS100 xps*-honeywell-sysv* ) @@ -380,7 +392,7 @@ case "${canonical}" in machine=hp800 opsys=hpux9 ;; hppa*-hp-hpux10* ) - machine=hp800 opsys=hpux9shr + machine=hp800 opsys=hpux10 ;; ## HP 9000 series 700 and 800, running HP/UX @@ -395,6 +407,9 @@ case "${canonical}" in *) machine=hp800 opsys=hpux ;; esac ;; + hppa-*-nextstep* ) + machine=hp800 opsys=nextstep + ;; ## Orion machines orion-orion-bsd* ) @@ -431,13 +446,13 @@ case "${canonical}" in ;; romp-ibm-bsd4.3* ) machine=ibmrt opsys=bsd4-3 - ;; + ;; romp-ibm-bsd4.2* ) machine=ibmrt opsys=bsd4-2 ;; romp-ibm-aos4.3* ) machine=ibmrt opsys=bsd4-3 - ;; + ;; romp-ibm-aos4.2* ) machine=ibmrt opsys=bsd4-2 ;; @@ -542,8 +557,8 @@ case "${canonical}" in ;; ## NeXT - m68*-next-* | i[345]86-next-* ) - machine=next opsys=mach2 + m68*-next-* | m68k-*-nextstep* ) + machine=m68k opsys=nextstep ;; ## The complete machine from National Semiconductor @@ -590,7 +605,7 @@ case "${canonical}" in ;; ## Siemens Nixdorf - mips-siemens-sysv* ) + mips-siemens-sysv* | mips-sni-sysv*) machine=mips-siemens opsys=usg5-4 NON_GNU_CC=/usr/ccs/bin/cc NON_GNU_CPP=/usr/ccs/lib/cpp @@ -612,7 +627,7 @@ case "${canonical}" in machine=iris4d opsys=irix4-0 ;; mips-sgi-irix6* ) - machine=iris4d opsys=irix6-0 + machine=iris4d opsys=irix6-0 NON_GNU_CPP=/lib/cpp ;; mips-sgi-irix5.[01]* ) machine=iris4d opsys=irix5-0 @@ -644,13 +659,16 @@ case "${canonical}" in ;; ## Suns - *-sun-sunos* | *-sun-bsd* | *-sun-solaris* | i[345]86-*-solaris2* | i[345]86-*-sunos5* ) + *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \ + | i[345]86-*-solaris2* | i[345]86-*-sunos5* | powerpc*-*-solaris2* \ + | rs6000-*-solaris2*) case "${canonical}" in m68*-sunos1* ) machine=sun1 ;; m68*-sunos2* ) machine=sun2 ;; m68* ) machine=sun3 ;; i[345]86-sun-sunos[34]* ) machine=sun386 ;; i[345]86-*-* ) machine=intel386 ;; + powerpc* | rs6000* ) machine=rs6000 ;; sparc* ) machine=sparc ;; * ) unported=yes ;; esac @@ -658,11 +676,18 @@ case "${canonical}" in ## The Sun386 didn't get past 4.0. i[345]86-*-sunos4 ) opsys=sunos4-0 ;; *-sunos4.0* ) opsys=sunos4-0 ;; - *-sunos4.1.[3-9]* ) + *-sunos4.1.[3-9]* | *-sunos4shr*) opsys=sunos4shr NON_GNU_CPP=/usr/lib/cpp ;; - *-sunos4* | *-sunos ) opsys=sunos4-1 + *-sunos4.1.[3-9]*-noshare ) + opsys=sunos4-1-3 + NON_GNU_CPP=/usr/lib/cpp + NON_GCC_TEST_OPTIONS=-Bstatic + GCC_TEST_OPTIONS=-static + ;; + *-sunos4* | *-sunos ) + opsys=sunos4-1 NON_GCC_TEST_OPTIONS=-Bstatic GCC_TEST_OPTIONS=-static ;; @@ -673,18 +698,23 @@ case "${canonical}" in *-sunos5.4* | *-solaris2.4* ) opsys=sol2-4 NON_GNU_CPP=/usr/ccs/lib/cpp + RANLIB="ar -ts" ;; *-sunos5.5* | *-solaris2.5* ) opsys=sol2-5 NON_GNU_CPP=/usr/ccs/lib/cpp + RANLIB="ar -ts" ;; *-sunos5* | *-solaris* ) - opsys=sol2 + opsys=sol2-4 NON_GNU_CPP=/usr/ccs/lib/cpp ;; * ) opsys=bsd4-2 ;; esac ;; + sparc-*-nextstep* ) + machine=sparc opsys=nextstep + ;; ## Tadpole 68k m68*-tadpole-sysv* ) @@ -724,7 +754,7 @@ case "${canonical}" in titan-titan-sysv* ) machine=titan opsys=usg5-3 ;; - + ## Ustation E30 (SS5E) m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 @@ -763,7 +793,10 @@ case "${canonical}" in *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; *-isc2.2* ) opsys=isc2-2 ;; *-isc4.0* ) opsys=isc4-0 ;; - *-isc4.* ) opsys=isc4-1 ;; + *-isc4.* ) opsys=isc4-1 + GCC_TEST_OPTIONS=-posix + NON_GCC_TEST_OPTIONS=-Xp + ;; *-isc* ) opsys=isc3-0 ;; *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;; *-esix* ) opsys=esix ;; @@ -774,11 +807,16 @@ case "${canonical}" in *-bsdi2* ) opsys=bsdos2 ;; *-386bsd* ) opsys=386bsd ;; *-freebsd* ) opsys=freebsd ;; - *-nextstep* ) opsys=mach2 ;; + *-nextstep* ) opsys=nextstep ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac ;; + ## Linux/68k + m68k-*-linux* ) + machine=m68k opsys=linux + ;; + * ) unported=yes ;; @@ -799,22 +837,26 @@ if test x"${opsys}" = x; then *-sysv0 | *-sysvr0 ) opsys=usg5-0 ;; *-sysv2 | *-sysvr2 ) opsys=usg5-2 ;; *-sysv2.2 | *-sysvr2.2 ) opsys=usg5-2-2 ;; - *-sysv3 | *-sysvr3 ) opsys=usg5-3 ;; - *-sysv4 | *-sysvr4 ) opsys=usg5-4 ;; - *-sysv4.1 | *-sysvr4.1 ) + *-sysv3* | *-sysvr3* ) opsys=usg5-3 ;; + *-sysv4.1* | *-sysvr4.1* ) NON_GNU_CPP=/usr/lib/cpp opsys=usg5-4 ;; - *-sysv4.2 | *-sysvr4.2 ) + *-sysv4.[2-9]* | *-sysvr4.[2-9]* ) if [ x$NON_GNU_CPP = x ]; then NON_GNU_CPP=/usr/ccs/lib/cpp fi opsys=usg5-4-2 ;; + *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;; * ) unported=yes ;; esac fi +if test "x$RANLIB" = x; then + RANLIB=ranlib +fi + changequote([, ])dnl if test $unported = yes; then @@ -829,6 +871,9 @@ opsysfile="s/${opsys}.h" #### Choose a compiler. test -n "$CC" && cc_specified=yes +# Save the value of CFLAGS that the user specified. +SPECIFIED_CFLAGS="$CFLAGS" + case ${with_gcc} in "yes" ) CC="gcc" GCC=yes ;; "no" ) : ${CC=cc} ;; @@ -860,12 +905,12 @@ fi if test x$GCC = xyes && test "x$GCC_TEST_OPTIONS" != x then CC="$CC $GCC_TEST_OPTIONS" -fi +fi if test x$GCC = x && test "x$NON_GCC_TEST_OPTIONS" != x then CC="$CC $NON_GCC_TEST_OPTIONS" -fi +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 @@ -920,6 +965,7 @@ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME #endif #endif], [static struct timeval x; x.tv_sec = x.tv_usec;], [AC_MSG_RESULT(yes) + HAVE_TIMEVAL=yes AC_DEFINE(HAVE_TIMEVAL)], AC_MSG_RESULT(no)) @@ -956,7 +1002,7 @@ fi if test x"${x_includes}" = x; then bitmapdir=/usr/include/X11/bitmaps else - # accumulate include directories that have X11 bitmap sudirectories + # accumulate include directories that have X11 bitmap subdirectories bmd_acc="dummyval" for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do if test -d "${bmd}/X11/bitmaps"; then @@ -975,10 +1021,13 @@ case "${window_system}" in HAVE_X_WINDOWS=yes HAVE_X11=yes case "${with_x_toolkit}" in - athena | lucid ) USE_X_TOOLKIT=LUCID ;; - motif ) USE_X_TOOLKIT=MOTIF ;; -dnl open-look ) USE_X_TOOLKIT=OPEN_LOOK ;; - * ) USE_X_TOOLKIT=none ;; + athena | lucid ) USE_X_TOOLKIT=LUCID ;; + motif ) USE_X_TOOLKIT=MOTIF ;; +dnl open-look ) USE_X_TOOLKIT=OPEN_LOOK ;; + no ) USE_X_TOOLKIT=none ;; +dnl If user did not say whether to use a toolkit, +dnl make this decision later: use the toolkit if we have X11R5 or newer. + * ) USE_X_TOOLKIT=maybe ;; esac ;; none ) @@ -987,12 +1036,11 @@ dnl open-look ) USE_X_TOOLKIT=OPEN_LOOK ;; USE_X_TOOLKIT=none ;; esac -X_TOOLKIT_TYPE=$USE_X_TOOLKIT ### If we're using X11, we should use the X menu package. -HAVE_X_MENU=no +HAVE_MENUS=no case ${HAVE_X11} in - yes ) HAVE_X_MENU=yes ;; + yes ) HAVE_MENUS=yes ;; esac if test "${opsys}" = "hpux9"; then @@ -1088,18 +1136,18 @@ configure___ system_malloc=no /* Get the CFLAGS for tests in configure. */ #ifdef __GNUC__ -configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' +configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' #else -configure___ CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' +configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' #endif #else /* not THIS_IS_CONFIGURE */ /* Get the CFLAGS for real compilation. */ #ifdef __GNUC__ -configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}' +configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' #else -configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${CFLAGS}' +configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' #endif #endif /* not THIS_IS_CONFIGURE */ @@ -1111,7 +1159,7 @@ CPP=`eval "echo $CPP"` changequote(, )dnl eval `${CPP} -Isrc ${tempcname} \ | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'` -if test "x$CFLAGS" = x; then +if test "x$SPECIFIED_CFLAGS" = x; then eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \ | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'` else @@ -1142,7 +1190,7 @@ LISP_FLOAT_TYPE=yes #### Add the libraries to LIBS and check for some functions. CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" -LIBS="$libsrc_libs" +LIBS="$libsrc_libs $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. @@ -1210,8 +1258,36 @@ if test "${HAVE_X11}" = "yes"; then AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ XScreenNumberOfScreen XSetWMProtocols) + AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) fi +if test "${window_system}" = "x11"; then + AC_MSG_CHECKING(X11 version 6) + AC_TRY_LINK([#include ], +[#if XlibSpecificationRelease < 6 +fail; +#endif +], [AC_MSG_RESULT(6) + AC_DEFINE(HAVE_X11R6)], + [AC_MSG_RESULT(not 6)]) +fi + +if test x"${USE_X_TOOLKIT}" = xmaybe; then + AC_MSG_CHECKING(X11 version 5) + AC_TRY_LINK([#include ], +[#if XlibSpecificationRelease < 5 +fail; +#endif +], [AC_MSG_RESULT(5, use toolkit) + USE_X_TOOLKIT=LUCID + AC_DEFINE(HAVE_X11R5)], + [AC_MSG_RESULT(not 5, do not use toolkit) + USE_X_TOOLKIT=none]) + fi +fi + +X_TOOLKIT_TYPE=$USE_X_TOOLKIT + if test "${USE_X_TOOLKIT}" != "none"; then AC_MSG_CHECKING(X11 toolkit version) AC_TRY_LINK([#include ], @@ -1237,8 +1313,62 @@ AC_FUNC_ALLOCA # On HPUX 9.01, -lm does not contain logb, so check for sqrt. AC_CHECK_LIB(m, sqrt(0.0) + t) AC_CHECK_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \ -random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \ -strerror fpathconf select mktime eaccess getpagesize) +random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \ +strerror fpathconf select mktime eaccess getpagesize tzset) + +AC_MSG_CHECKING(whether localtime caches TZ) +AC_CACHE_VAL(emacs_cv_localtime_cache, +[if test $ac_cv_func_tzset = yes; then +AC_TRY_RUN([#include +#if STDC_HEADERS +# include +#endif +main() +{ + time_t now = time ((time_t *) 0); + int hour; + if (putenv ("TZ=GMT0") != 0) + exit (1); + hour = localtime (&now)->tm_hour; + if (putenv ("TZ=PST8") != 0) + exit (1); + exit (localtime (&now)->tm_hour == hour); +}], emacs_cv_localtime_cache=no, emacs_cv_localtime_cache=yes, +[# If we have tzset, assume the worst when cross-compiling. +emacs_cv_localtime_cache=yes]) +else + # If we lack tzset, report that localtime does not cache TZ, + # since we can't invalidate the cache if we don't have tzset. + emacs_cv_localtime_cache=no +fi])dnl +AC_MSG_RESULT($emacs_cv_localtime_cache) +if test $emacs_cv_localtime_cache = yes; then + AC_DEFINE(LOCALTIME_CACHE) +fi + +if test "x$HAVE_TIMEVAL" = xyes; then +AC_MSG_CHECKING(whether gettimeofday can't accept two arguments) +AC_TRY_LINK([ +#ifdef TIME_WITH_SYS_TIME +#include +#include +#else +#ifdef HAVE_SYS_TIME_H +#include +#else +#include +#endif +#endif + ], + [ + struct timeval time; + struct timezone dummy; + gettimeofday (&time, &dummy); +], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)]) +fi ok_so_far=yes AC_CHECK_FUNC(socket, , ok_so_far=no) @@ -1299,6 +1429,7 @@ AC_SUBST(CFLAGS) AC_SUBST(X_TOOLKIT_TYPE) AC_SUBST(machfile) AC_SUBST(opsysfile) +AC_SUBST(RANLIB) AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}") AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}") @@ -1321,8 +1452,8 @@ fi if test "${HAVE_XFREE386}" = "yes" ; then AC_DEFINE(HAVE_XFREE386) fi -if test "${HAVE_X_MENU}" = "yes" ; then - AC_DEFINE(HAVE_X_MENU) +if test "${HAVE_MENUS}" = "yes" ; then + AC_DEFINE(HAVE_MENUS) fi if test "${GNU_MALLOC}" = "yes" ; then AC_DEFINE(GNU_MALLOC)