(docref-subst): Doc fix.

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index 9824375..a72e4b9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,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 +42,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
@@ -343,11 +343,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* )
@@ -385,7 +391,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
@@ -595,7 +601,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
@@ -617,7 +623,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
@@ -649,13 +655,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
@@ -667,7 +676,14 @@ case "${canonical}" in
                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
                ;;
@@ -686,14 +702,14 @@ case "${canonical}" in
                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.h opsys=nextstep.h
+    machine=sparc opsys=nextstep
   ;;
 
   ## Tadpole 68k
@@ -792,6 +808,11 @@ case "${canonical}" in
     esac
   ;;
 
+  ## Linux/68k
+  m68k-*-linux* )
+    machine=m68k opsys=linux
+  ;;
+
   * )
     unported=yes
   ;;
@@ -1011,9 +1032,9 @@ 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
@@ -1163,7 +1184,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.
@@ -1231,6 +1252,18 @@ 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)
+  AC_TRY_LINK([#include <X11/Xlib.h>],
+[#if XlibSpecificationRelease < 6
+fail;
+#endif
+], [AC_MSG_RESULT(6)
+    AC_DEFINE(HAVE_X11R6)],
+   [AC_MSG_RESULT(not 6)])
 fi
 
 if test "${USE_X_TOOLKIT}" != "none"; then
@@ -1258,7 +1291,7 @@ 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 \
+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)
@@ -1291,7 +1324,7 @@ if test $emacs_cv_localtime_cache = yes; then
   AC_DEFINE(LOCALTIME_CACHE)
 fi
 
-if test $HAVE_TIMEVAL = yes; then
+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
@@ -1397,8 +1430,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)