IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into unstable

Browse Source 
Resolved conflicts:
	CMakeLists.txt
	NEWS
	configure.ac
This commit is contained in:
Geert Janssens
2017-09-27 17:35:13 +02:00
parent d5b0dddb74 5ac849623a
commit b3b4b20e4b
8 changed files with 23256 additions and 23143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/cmake_modules/MakeDist.cmake
View File

@@ -22,43 +22,20 @@ FUNCTION(FIND_AUTOMAKE AUTOMAKE_VAR ACLOCAL_VAR AUTOMAKE_VERSION_VAR NEED_OVERRI
ERROR_VARIABLE AUTOMAKE_ERROR
)
# GnuCash will not pass distcheck under automake 1.15+
# See if automake-1.11 is available. If so use, that
SET(AUTOMAKE_OK TRUE)
SET(NEED_OVERRIDE FALSE)
IF(${AUTOMAKE} STREQUAL AUTOMAKE-NOTFOUND)
SET(AUTOMAKE_OK FALSE)
ELSE()
STRING(REGEX REPLACE ".*automake \\(GNU automake\\) ([0-9]\\.[0-9]+).*" "\\1" AUTOMAKE_VERSION "${AUTOMAKE_OUTPUT}")
IF (${AUTOMAKE_VERSION} VERSION_GREATER "1.14")
SET(AUTOMAKE_OK FALSE)
ELSE()
FIND_PROGRAM(ACLOCAL aclocal)
IF(${ACLOCAL} STREQUAL ACLOCAL-NOTFOUND)
MESSAGE(FATAL_ERROR "Found ok version of automake, but can't find aclocal")
ENDIF()
FIND_PROGRAM(ACLOCAL aclocal)
IF(${ACLOCAL} STREQUAL ACLOCAL-NOTFOUND)
MESSAGE(FATAL_ERROR "Found ok version of automake, but can't find aclocal")
ENDIF()
ENDIF()
IF (NOT AUTOMAKE_OK)
FIND_PROGRAM(AUTOMAKE11 automake-1.11)
IF (${AUTOMAKE11} STREQUAL AUTOMAKE11-NOTFOUND)
IF (${AUTOMAKE} STREQUAL AUTOMAKE-NOTFOUND)
MESSAGE(FATAL_ERROR "Can't find 'automake' or 'automake-1.11'")
ELSE()
MESSAGE("Automake is incompatible version 1.15+, but can't find automake-1.11")
MESSAGE(" You can set AUTOTOOLS_IN_DIST=OFF to exclude autotools support.")
MESSAGE(FATAL_ERROR "automake not compatible")
ENDIF()
ELSE()
SET(AUTOMAKE ${AUTOMAKE11})
SET(AUTOMAKE_VERSION 1.11)
SET(NEED_OVERRIDE TRUE)
FIND_PROGRAM(ACLOCAL aclocal-1.11)
IF(${ACLOCAL} STREQUAL ACLOCAL-NOTFOUND)
MESSAGE(FATAL_ERROR "Found automake-1.11, but not aclocal-1.11")
ENDIF()
ENDIF()
MESSAGE(FATAL_ERROR "Can't find 'automake' or 'automake-1.11'")
MESSAGE(" You can set AUTOTOOLS_IN_DIST=OFF to exclude autotools support.")
ENDIF()
SET(${AUTOMAKE_VAR} ${AUTOMAKE} PARENT_SCOPE)
SET(${ACLOCAL_VAR} ${ACLOCAL} PARENT_SCOPE)