start porting to 3.9

cmake/Modules/ieee802_11Config.cmake

@@ -1,9 +1,11 @@
-INCLUDE(FindPkgConfig)
+if(NOT PKG_CONFIG_FOUND)
+    INCLUDE(FindPkgConfig)
+endif()
 PKG_CHECK_MODULES(PC_IEEE802_11 ieee802_11)
 
 FIND_PATH(
     IEEE802_11_INCLUDE_DIRS
-    NAMES ieee802-11/api.h
+    NAMES ieee802_11/api.h
     HINTS $ENV{IEEE802_11_DIR}/include
         ${PC_IEEE802_11_INCLUDEDIR}
     PATHS ${CMAKE_INSTALL_PREFIX}/include

cmake/Modules/targetConfig.cmake.in

@@ -2,20 +2,8 @@
 #
 # This file is part of GNU Radio
 #
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
 
 include(CMakeFindDependencyMacro)