Merged from emacs@sv.gnu.org

[gnu-emacs] / configure

diff --git a/configure b/configure
index 5b8fe5605320ec55b1464d56c704576a9c3a46cc..0d3a98c8a14177fb4796397336d71526fa9af004 100755 (executable)
--- a/configure
+++ b/configure
@@ -2235,6 +2235,7 @@ _ACEOF
       vax-*-netbsd*)   machine=vax ;;
       arm-*-netbsd*)   machine=arm ;;
       x86_64-*-netbsd*)        machine=amdx86-64 ;;
+      hppa-*-netbsd*)  machine=hp800 ;;
       shle-*-netbsd*)  machine=sh3el ;;
     esac
   ;;
@@ -2572,6 +2573,14 @@ _ACEOF
     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
@@ -6278,13 +6287,13 @@ echo "${ECHO_T}yes" >&6; }
 
             { echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
 echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6; }
-            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"`
+            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
 echo "${ECHO_T}$ALSA_CFLAGS" >&6; }
 
             { echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
 echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6; }
-            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"`
+            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
 echo "${ECHO_T}$ALSA_LIBS" >&6; }
         else
@@ -10943,13 +10952,13 @@ echo "${ECHO_T}yes" >&6; }
 
             { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
 echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; }
-            GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"`
+            GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
 echo "${ECHO_T}$GTK_CFLAGS" >&6; }
 
             { echo "$as_me:$LINENO: checking GTK_LIBS" >&5
 echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; }
-            GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"`
+            GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
 echo "${ECHO_T}$GTK_LIBS" >&6; }
         else
@@ -11589,13 +11598,13 @@ echo "${ECHO_T}yes" >&6; }
 
             { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
 echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; }
-            XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"`
+            XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5
 echo "${ECHO_T}$XFT_CFLAGS" >&6; }
 
             { echo "$as_me:$LINENO: checking XFT_LIBS" >&5
 echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
-            XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"`
+            XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
             { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
 echo "${ECHO_T}$XFT_LIBS" >&6; }
         else