find tifflib on non-homebrew setup

Author: dk

Makefile.PL

@@ -207,7 +207,7 @@ sub setup_argv
 		WITH_GTK3       => $ENV{PRIMA_WITH_GTK3}        // ($^O !~ /mswin32/i),
 		WITH_OPENMP     => $ENV{PRIMA_WITH_OPENMP}      // 1,
 		WITH_COCOA      => $ENV{PRIMA_WITH_COCOA}       // ($^O eq 'darwin'),
-		WITH_HOMEBREW   => $ENV{PRIMA_WITH_HOMEBREW}    // ($^O eq 'darwin'),
+		WITH_HOMEBREW   => $ENV{PRIMA_WITH_HOMEBREW}    // ($^O eq 'darwin' && -d '/opt/homebrew'),
 		OPTION_IS_ALT   => $ENV{OPTION_IS_ALT}          // ($^O eq 'darwin'),
 		WITH_LIBTHAI    => $ENV{PRIMA_WITH_LIBTHAI}     // 1,
 		DEBUG           => $ENV{PRIMA_DEBUG}            // 0,
@@ -1423,21 +1423,22 @@ sub homebrew_nopkgconfig
 {
 	my $package = shift;
 	my $root = '/opt/homebrew';
+	return unless -d $root;
 
 	printlog "Checking for $package using homebrew directory structure...";
 
-	goto FAIL unless -d $root;
 	$root .= "/Cellar/$package";
 	goto FAIL unless -d $root;
 
 	my @dirs = sort { $b cmp $a } grep { -d $_ } <$root/*>;
 	goto FAIL unless @dirs;
 	$root = $dirs[0];
+	my @inc = <$root/include/*.h>;
+
 	goto FAIL unless
 		-d "$root/include" &&
 		-d "$root/lib"     &&
-		(<$root/include/*.h>)
-		;
+		@inc;
 
 	my @libs = grep {
 		s[.*\/][];
@@ -1680,9 +1681,6 @@ sub setup_xft
 This happened because broken setup was detected where both harfbuzz and libXft
 depend on freetype2, but one on /opt/X11 and another in /usr/local.
 This _WILL_ result in coredumps.
-BROKEN_PATH_SETUP
-
-				$END .= <<BROKEN_PATH_SETUP if $cmd_options{WITH_HOMEBREW};
 
 To resolve the issue install libXft that uses the recent freetype2, with
 
@@ -2128,15 +2126,15 @@ sub setup_codecs
 				$found = 1 if pkgconfig('libjxl');
 			} elsif ( $codec eq 'tiff') {
 				$found = 1 if pkgconfig('libtiff-5') || pkgconfig('libtiff-4');
+				# homebrew's tiff needs zlib that has .pc laying in some cryptic location, so just hack this intead
+				$found = 1 if $MacOSX && !$cmd_options{WITH_HOMEBREW} && homebrew_nopkgconfig('libtiff');
 			} elsif ( $codec eq 'Xpm') {
 				$found = 1 if pkgconfig('xpm');
 			} # gif and jpeg -- I've never seen yet these libs shipped with .pc file, so don't check them so far
-			elsif ( $MacOSX && !$cmd_options{WITH_HOMEBREW}) {
+			elsif ( $MacOSX && !$cmd_options{WITH_HOMEBREW} && $codec eq 'gif') {
 				# there's no generic path adding on this configuration, so make a horrible hack 
 				# specifically for this:
-				if ( $codec eq 'gif') {
-					$found = 1 if homebrew_nopkgconfig('giflib');
-				}
+				$found = 1 if homebrew_nopkgconfig('giflib');
 			}
 			if ( $found ) {
 				push( @ACTIVE_CODECS, $codec);