X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2Ficmp-warning.pl;h=d5e7fd9241b6706c714781cebbaa4a3d189c0bfb;hp=044158b8383ddf44d7498473d970ed9cafa7dcaf;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hpb=3f1091236d800c43a3124c44c7da54e53f205b13

diff --git a/OSX/icmp-warning.pl b/OSX/icmp-warning.pl
index 044158b8..d5e7fd92 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-2014 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
@@ -16,7 +16,7 @@ require 5;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.2 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
+my ($version) = ('$Revision: 1.3 $' =~ 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 -s $d3$f $d1$d2\n"
       unless (-f "$d1$d2$f");
   }