Merge further FreeBSD build fixes from 'pre-0.78'.

cmake/gtk.cmake

@@ -74,6 +74,7 @@ if(GTK_FOUND)
   # Check for some particular Pango functions.
   function(pango_check_subscope)
     set(CMAKE_REQUIRED_INCLUDES ${GTK_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_LINK_OPTIONS ${GTK_LDFLAGS})
     set(CMAKE_REQUIRED_LIBRARIES ${GTK_LIBRARIES})
     check_symbol_exists(pango_font_family_is_monospace "pango/pango.h"
       HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)

unix/pageant.c

@@ -330,9 +330,9 @@ void pageant_fork_and_print_env(bool retain_tty)
         /* Get out of our previous process group, to avoid being
          * blasted by passing signals. But keep our controlling tty,
          * so we can keep checking to see if we still have one. */
-#if defined HAVE_NULLARY_SETPGRP
+#if HAVE_NULLARY_SETPGRP
         setpgrp();
-#elif defined HAVE_BINARY_SETPGRP
+#elif HAVE_BINARY_SETPGRP
         setpgrp(0, 0);
 #endif
     } else {