Fix FSF address in comment.

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index d47e2e9..47df36c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,8 +18,9 @@ dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
-dnl  along with GNU Emacs; see the file COPYING.  If not, write to
-dnl  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
+dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl  Boston, MA 02111-1307, USA.
 
 AC_PREREQ(2.8)dnl
 AC_INIT(src/lisp.h)
@@ -516,6 +517,11 @@ case "${canonical}" in
     NON_GNU_CPP="/lib/cpp"
   ;;
 
+  ## ncr machine running svr4.3.
+  i[3456]86-ncr-sysv4.3 )
+    machine=ncr386 opsys=usg5-4-3
+  ;;
+
   ## Unspecified sysv on an ncr machine defaults to svr4.2.
   ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
   i[3456]86-ncr-sysv* )
@@ -647,7 +653,9 @@ case "${canonical}" in
     machine=iris4d opsys=irix4-0
   ;;
   mips-sgi-irix6* )
-    machine=iris4d opsys=irix6-0  NON_GNU_CPP=/lib/cpp
+    machine=iris4d opsys=irix6-0
+    NON_GNU_CPP=/lib/cpp
+    NON_GCC_TEST_OPTIONS=-32
   ;;
   mips-sgi-irix5.[01]* )
     machine=iris4d opsys=irix5-0
@@ -845,7 +853,8 @@ case "${canonical}" in
                                OVERRIDE_CPPFLAGS=
                                ;;
       *-bsd386* | *-bsdi1* )   opsys=bsd386 ;;
-      *-bsdi2* )               opsys=bsdos2 ;;
+      *-bsdi2.0* )             opsys=bsdos2 ;;
+      *-bsdi2* )               opsys=bsdos2-1 ;;
       *-386bsd* )              opsys=386bsd ;;
       *-freebsd* )             opsys=freebsd ;;
       *-nextstep* )             opsys=nextstep ;;
@@ -1346,12 +1355,14 @@ fail;
     AC_MSG_RESULT(before 5)])
 fi
 
+dnl Do not put whitespace before the #include statements below.
+dnl Older compilers (eg sunos4 cc) choke on it.
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
   if test x"${HAVE_X11R5}" = xyes; then
     AC_MSG_CHECKING(X11 version 5 with Xaw)
     AC_TRY_LINK([
-         #include <X11/Intrinsic.h>
-         #include <X11/Xaw/Simple.h>],
+#include <X11/Intrinsic.h>
+#include <X11/Xaw/Simple.h>],
       [],
       [AC_MSG_RESULT(5 or newer, with Xaw; use toolkit by default)
        USE_X_TOOLKIT=LUCID],
@@ -1404,7 +1415,7 @@ AC_CHECK_LIB(m, sqrt)
 
 AC_CHECK_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
 random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \
-strerror fpathconf select mktime eaccess getpagesize tzset setlocale)
+strerror fpathconf select mktime euidaccess getpagesize tzset setlocale)
 
 # Check this now, so that we will NOT find the above functions in ncurses.
 # That is because we have not set up to link ncurses in lib-src.