Merged from emacs@sv.gnu.org

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index dc174874e2e76b8eeaf172809e4f2e1591094b9d..2981e8888f05a5072fb1a07fbc068b959d0ca818 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -269,6 +269,7 @@ dnl see the `changequote' comment above.
       vax-*-netbsd*)   machine=vax ;;
       arm-*-netbsd*)   machine=arm ;;
       x86_64-*-netbsd*)        machine=amdx86-64 ;;
+      hppa-*-netbsd*)  machine=hp800 ;;
       shle-*-netbsd*)  machine=sh3el ;;
     esac
   ;;
@@ -606,6 +607,14 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
+  hppa*-*-linux-gnu* )
+    machine=hp800 opsys=gnu-linux
+  ;;
+
+  hppa*-*-nextstep* )
+    machine=hp800 opsys=nextstep
+  ;;
+
   ## Orion machines
   orion-orion-bsd* )
     machine=orion opsys=bsd4-2
@@ -1475,11 +1484,11 @@ AC_DEFUN([PKG_CHECK_MODULES], [
             succeeded=yes
 
             AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"|sed -e 's,///*,/,g'`
             AC_MSG_RESULT($$1_CFLAGS)
 
             AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            $1_LIBS=`$PKG_CONFIG --libs "$2"|sed -e 's,///*,/,g'`
             AC_MSG_RESULT($$1_LIBS)
         else
             AC_MSG_RESULT(no)