Merge from emacs-23.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 923f8095fa19f223683166146de72437cb996cea..4e8a31ecc5665c7dc7489dc22eefe5d0457f8d40 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -515,6 +515,14 @@ case "${canonical}" in
     CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
   ;;
 
+  ia64*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+  ;;
+
+  hppa*-*-linux-gnu* )
+    machine=hp800 opsys=gnu-linux
+  ;;
+
   ## IBM machines
   rs6000-ibm-aix4.[23]* )
     machine=ibmrs6000 opsys=aix4-2