(i[3456]86-sequent-ptx4*, i[3456]86-sequent-sysv4*): Fix previous change.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index ae5c77ffd108de581aaa16cba659dfadef9b1878..e107508fb2a7b585726f77185d2f7cdbff7061db 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)
@@ -188,6 +189,9 @@ case "${canonical}" in
   ## Alpha (DEC) machines.
   alpha-dec-osf* )
     machine=alpha opsys=osf1
+    # This is needed to find X11R6.1 libraries for certain tests.
+    NON_GCC_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
+    GCC_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
   ;;
 
   alpha-*-linux-gnu* )
@@ -509,6 +513,12 @@ case "${canonical}" in
     machine=symmetry opsys=bsd4-3
   ;;
 
+  ## Sequent Symmetry running ptx 4, which is a modified SVR4.
+  i[3456]86-sequent-ptx4* | i[3456]86-sequent-sysv4* )
+    machine=sequent-ptx opsys=ptx4
+    NON_GNU_CPP=/lib/cpp
+  ;;
+
   ## Sequent Symmetry running DYNIX/ptx
   ## Use the old cpp rather than the newer ANSI one.
   i[3456]86-sequent-ptx* )
@@ -516,6 +526,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 +662,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
@@ -700,16 +717,16 @@ case "${canonical}" in
       ## The Sun386 didn't get past 4.0.
       i[3456]86-*-sunos4         ) opsys=sunos4-0 ;;
       *-sunos4.0*        ) opsys=sunos4-0 ;;
-      *-sunos4.1.[3-9]* | *-sunos4shr*)
-               opsys=sunos4shr
-               NON_GNU_CPP=/usr/lib/cpp
-               ;;
-      *-sunos4.1.[3-9]*-noshare )
+      *-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.1.[3-9]* | *-sunos4shr*)
+               opsys=sunos4shr
+               NON_GNU_CPP=/usr/lib/cpp
+               ;;
       *-sunos4* | *-sunos )
                opsys=sunos4-1
                NON_GCC_TEST_OPTIONS=-Bstatic
@@ -842,10 +859,11 @@ case "${canonical}" in
                                NON_GNU_CPP=/lib/cpp
                                # Prevent -belf from being passed to $CPP.
                                # /lib/cpp does not accept it.
-                               OVERRIDE_CPPFLAGS=
+                               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 ;;
@@ -1236,7 +1254,7 @@ LISP_FLOAT_TYPE=yes
 #### Add the libraries to LIBS and check for some functions.
 
 if test x"${OVERRIDE_CPPFLAGS}" != x; then
-  CPPFLAGS="$(OVERRIDE_CPPFLAGS)"
+  CPPFLAGS="${OVERRIDE_CPPFLAGS}"
 else
   CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
 fi
@@ -1346,12 +1364,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 +1424,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.
@@ -1427,16 +1447,18 @@ unset_TZ ()
     if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
       to++;
 }
+char TZ_GMT0[] = "TZ=GMT0";
+char TZ_PST8[] = "TZ=PST8";
 main()
 {
   time_t now = time ((time_t *) 0);
   int hour_GMT0, hour_unset;
-  if (putenv ("TZ=GMT0") != 0)
+  if (putenv (TZ_GMT0) != 0)
     exit (1);
   hour_GMT0 = localtime (&now)->tm_hour;
   unset_TZ ();
   hour_unset = localtime (&now)->tm_hour;
-  if (putenv ("TZ=PST8") != 0)
+  if (putenv (TZ_PST8) != 0)
     exit (1);
   if (localtime (&now)->tm_hour == hour_GMT0)
     exit (1);