X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2Ficmp-warning.pl;h=b0225637990117a681dc3e3a7c698f3290f555c1;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=ac76fdc31fb7cabb0949f76f17e7fb388cdb9ea1;hpb=c70f94f648d51bb4828193124f325fa52b0e57f3;p=xscreensaver

diff --git a/OSX/icmp-warning.pl b/OSX/icmp-warning.pl
index ac76fdc3..b0225637 100755
--- a/OSX/icmp-warning.pl
+++ b/OSX/icmp-warning.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2012 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2012-2018 Jamie Zawinski <jwz@jwz.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -12,11 +12,11 @@
 # Created: 20-Jun-2012.
 
 require 5;
-use diagnostics;
+#use diagnostics;	# Fails on some MacOS 10.5 - 10.7 systems
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.1 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
+my ($version) = ('$Revision: 1.4 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 0;
 
@@ -25,8 +25,28 @@ sub sanity_check() {
   my $fail = '';
   my $d1 = $ENV{SDK_DIR} || '';
   my $d2 = '/usr/include/netinet/';
+  my $d3 = $d2;
+
+  if (! $d1) {
+    print STDERR "ERROR: SDK_DIR unset\n";
+    exit 1;
+  }
+
+  if (! -d $d3) {
+    my @dirs = glob ("/Applications/Xcode.app/Contents/Developer/" .
+                     "Platforms/MacOSX.platform/Developer/SDKs/" .
+                     "MacOSX*sdk/usr/include/netinet");
+    @dirs = sort @dirs;
+    $d3 = $dirs[$#dirs] . "/" if @dirs;
+  }
+
+  if (! -d $d3) {
+    print STDERR "ERROR: There is no $d3 on this system!\n";
+    exit 1;
+  }
+
   foreach my $f ('ip.h', 'in_systm.h', 'ip_icmp.h', 'ip_var.h', 'udp.h') {
-    $fail .= "\tsudo ln -s $d2$f $d1$d2\n"
+    $fail .= "\tsudo ln -sf $d3$f $d1$d2\n"
       unless (-f "$d1$d2$f");
   }