From 6107abd74fa2f26194eef7c2b4ba26d728a7c4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 4 May 2019 18:42:08 +0200
Subject: [PATCH] cmake: Search for ifconfig, route, and iwconfig instead of
 using predefined paths.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 CMakeLists.txt        |  7 -------
 ConfigureChecks.cmake | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33a9506..74694e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,13 +53,6 @@ option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
 option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
 
 
-##### user defined options
-
-set( PATH_IFCONFIG "/sbin/ifconfig" CACHE STRING "Path for the ifconfig program" )
-set( PATH_IWCONFIG "/sbin/iwconfig" CACHE STRING "Path for the iwconfig program" )
-set( PATH_ROUTE    "/sbin/route"    CACHE STRING "Path for the route program"    )
-
-
 ##### configure checks
 
 include( ConfigureChecks.cmake )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 71c36d8..9db25bd 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -25,15 +25,41 @@ if( WITH_GCC_VISIBILITY )
 endif( WITH_GCC_VISIBILITY )
 
 
+##### search for programs
+
+message( STATUS "Checking for ifconfig" )
+find_program( PATH_IFCONFIG "ifconfig" DOC "Path for the ifconfig program" )
+if( NOT PATH_IFCONFIG )
+  tde_message_fatal( "Program ifconfig is required but was not found on your system." )
+endif( )
+message( STATUS "Checking for ifconfig - found ${PATH_IFCONFIG}" )
+
+message( STATUS "Checking for route" )
+find_program( PATH_ROUTE    "route"    DOC "Path for the route program"    )
+if( NOT PATH_ROUTE )
+  message( STATUS "Checking for route - not found" )
+else( )
+  message( STATUS "Checking for route - found ${PATH_ROUTE}" )
+endif( )
+
+message( STATUS "Checking for iwconfig" )
+find_program( PATH_IWCONFIG "iwconfig" DOC "Path for the iwconfig program" )
+if( NOT PATH_IWCONFIG )
+  message( STATUS "Checking for iwconfig - not found" )
+else( )
+  message( STATUS "Checking for iwconfig - found ${PATH_IWCONFIG}" )
+endif( )
+
+
 ##### support for libiw
 
 if( WITH_LIBIW )
-check_include_file( "iwlib.h" IW_HEADER )
-find_library( IW_LIBRARIES NAMES iw )
+  check_include_file( "iwlib.h" IW_HEADER )
+  find_library( IW_LIBRARIES NAMES iw )
 
-if( IW_HEADER AND IW_LIBRARIES )
-   set( HAVE_LIBIW 1 )
+  if( IW_HEADER AND IW_LIBRARIES )
+    set( HAVE_LIBIW 1 )
     else()
-   tde_message_fatal( "libiw support is requested but was not found on your system" )
-endif( IW_HEADER AND IW_LIBRARIES )
+      tde_message_fatal( "libiw support is requested but was not found on your system" )
+  endif( IW_HEADER AND IW_LIBRARIES )
 endif( WITH_LIBIW )