small tweaks from Jarkko Hietaniemi <jhi@cc.hut.fi>

p4raw-id: //depot/perl@1457

4 files changed, 11 insertions, 5 deletions

diff --git a/Configure b/Configure
index 938b4fbf92..8a06f643d9 100755
--- a/Configure
+++ b/Configure
@@ -11133,8 +11133,8 @@ for xxx in $known_extensions ; do
 		esac
 		;;
 	IPC/SysV|ipc/sysv)
-		case "$d_sem" in 
-		$define) avail_ext="$avail_ext $xxx" ;;
+		case "${d_msg}${d_sem}${d_shm}" in 
+		*"${define}"*) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
 	*)	avail_ext="$avail_ext $xxx"
diff --git a/Makefile.SH b/Makefile.SH
index f0a70e828d..260c23515c 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -380,10 +380,11 @@ preplibrary: miniperl lib/Config.pm $(plextract)
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
 lib/Config.pm: config.sh miniperl configpm
 	$(LDLIBPTH) ./miniperl configpm tmp
-	sh mv-if-diff tmp lib/Config.pm
+	sh mv-if-diff tmp $@
 
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm
-	$(LDLIBPTH) ./miniperl minimod.pl > tmp && ( rm -f $@ ; mv tmp $@ )
+	$(LDLIBPTH) ./miniperl minimod.pl > tmp
+	sh mv-if-diff tmp $@
 
 lib/re.pm: ext/re/re.pm
 	cat ext/re/re.pm > $@
diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs
index cefcb24422..ec0f633974 100644
--- a/ext/Socket/Socket.xs
+++ b/ext/Socket/Socket.xs
@@ -14,7 +14,9 @@
 #  include <netinet/in.h>
 # endif
 #include <netdb.h>
-#include <arpa/inet.h>
+#ifdef I_ARPA_INET
+# include <arpa/inet.h>
+#endif
 #else
 #include "sockadapt.h"
 #endif
diff --git a/perl.c b/perl.c
index 72e2e38b82..329575a6a9 100644
--- a/perl.c
+++ b/perl.c
@@ -1718,6 +1718,9 @@ moreswitches(char *s)
 #ifdef atarist
 	printf("atariST series port, ++jrb  bammi@cadence.com\n");
 #endif
+#ifdef __BEOS__
+	printf("BeOS port Copyright Tom Spindler, 1997-1998\n");
+#endif
 #ifdef BINARY_BUILD_NOTICE
 	BINARY_BUILD_NOTICE;
 #endif