mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-11-04 01:03:04 +00:00 
			
		
		
		
	Fix detection of aclocal
This commit is contained in:
		@@ -1111,7 +1111,9 @@ if(NOT MATIO_FOUND)
 | 
			
		||||
                endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
 | 
			
		||||
                message(FATAL_ERROR "libtool is required to build matio from source")
 | 
			
		||||
            endif(NOT EXISTS "/usr/bin/libtoolize")
 | 
			
		||||
            if(NOT EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
 | 
			
		||||
            if(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
 | 
			
		||||
                message(STATUS "aclocal found")
 | 
			
		||||
            else(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
 | 
			
		||||
                message(" aclocal has not been found.")
 | 
			
		||||
                message(" You can try to install it by typing:")
 | 
			
		||||
                if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
 | 
			
		||||
@@ -1122,7 +1124,7 @@ if(NOT MATIO_FOUND)
 | 
			
		||||
                    message(" sudo apt-get install automake")
 | 
			
		||||
                endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
 | 
			
		||||
                message(FATAL_ERROR "aclocal is required to build matio from source")
 | 
			
		||||
             endif(NOT EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
 | 
			
		||||
             endif(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
 | 
			
		||||
        endif(OS_IS_LINUX)      
 | 
			
		||||
        find_package(HDF5)
 | 
			
		||||
        if(HDF5_FOUND)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user