Changeset 3212 for branches/emacs-merge/configure.in

Timestamp:

12/29/03 22:20:58 (5 years ago)

Author:

miyoshi

Message:

Sync up with Emacs-21.3.

Files:

• branches/emacs-merge/configure.in (modified) (8 diffs)

branches/emacs-merge/configure.in

@@ -4 +4 @@
-dnl in the directory containing this script.
-dnl
-
+, 2002
-dnl  Free Software Foundation, Inc.
-dnl
@@ -538 +538 @@
-  ;;
-
+  hppa*-hp-hpux10.2* )
+    machine=hp800 opsys=hpux10-20
+  ;;
+
-  hppa*-hp-hpux10* )
-    machine=hp800 opsys=hpux10
-  ;;
+
-  hppa*-hp-hpux1[1-9]* )
-    machine=hp800 opsys=hpux11
@@ -578 +583 @@
-  i370-ibm-aix*)
-    machine=ibm370aix opsys=usg5-3
+  ;;
+  s390-*-linux-gnu)
+    machine=ibms390 opsys=gnu-linux
-  ;;
-  rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
@@ -1049 +1057 @@
-
-  ## Mips Linux-based GNU system
-
+| mipsel-*-linux-gnu* 
-    machine=mips opsys=gnu-linux
-  ;;
@@ -1376 +1384 @@
-AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t,
-AC_TRY_COMPILE([#include <termios.h>], [speed_t x = 1;],
-
+, emacs_cv_speed_t=no
-if test $emacs_cv_speed_t = yes; then
-  AC_DEFINE(HAVE_SPEED_T)
@@ -1603 +1611 @@
-fi
-AC_MSG_RESULT($HAVE_XFREE386)
+
+dnl Check for need for bigtoc support on IBM AIX
+
+case ${host_os} in
+aix*)
+  AC_CACHE_CHECK([for -bbigtoc option], [gdb_cv_bigtoc], [
+    case $GCC in
+    yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;;
+    *) gdb_cv_bigtoc=-bbigtoc ;;
+    esac
+
+    LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
+    AC_TRY_LINK([], [int i;], [], [gdb_cv_bigtoc=])
+  ])
+  ;;
+esac
-
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
@@ -1868 +1892 @@
-  if test "${HAVE_JPEG}" = "yes"; then
-    AC_DEFINE(HAVE_JPEG)
+    AC_EGREP_CPP(
+changequote({, })dnl avoid leadingspace on the next line
+{version= *(6[2-9]|[7-9][0-9])},
+changequote([, ])dnl
+        [#include <jpeglib.h>
+         version=JPEG_LIB_VERSION
+],    
+        AC_DEFINE(HAVE_JPEG),
+        [AC_MSG_WARN([libjpeg found, but not version 6b or later])
+        HAVE_JPEG=no])
-  fi
-fi
@@ -1905 +1939 @@
-  if test "${with_gif}" != "no"; then
-    AC_CHECK_HEADER(gif_lib.h,
-
+
+
+
-  fi
-