diff options
| author | Patrick Sattler <sattler@itestra.de> | 2014-03-11 14:15:20 +0100 |
|---|---|---|
| committer | Stefan Laner <laner@itestra.de> | 2014-03-19 19:17:58 +0100 |
| commit | c3d1e959c9f39a3ccf8342072fc22db8e8408913 (patch) | |
| tree | b899fdc0d1131ee6f0734d6f0e66f23fc03c4592 | |
| parent | 90551a91cc73be9038c5bffaed3aee196cd8bb31 (diff) | |
| download | genivi-common-api-dbus-runtime-c3d1e959c9f39a3ccf8342072fc22db8e8408913.tar.gz | |
Some minor changes in the configure script
- added the option --with-loose-version-check to the configure script
(GLIPCI-216)
- more informative warning in configure.ac for missing glib
Change-Id: I6bcd845616b136b7e748875e5a46c7bfada3d858
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | configure.ac | 26 |
2 files changed, 25 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 4f3cc44..deacb5b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -36,7 +36,8 @@ org.eclipse.core.resources.prefs text *.MF text # Declare files that will always have CRLF line endings on checkout. -*.sln text eol=crlf +*.sln binary +*.vcxproj binary # Denote all files that are truly binary and should not be modified. *.png binary diff --git a/configure.ac b/configure.ac index bf7c21b..d655176 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,9 @@ AM_MAINTAINER_MODE COMMONAPI_API_HEADER_VERSION="2.1" AC_SUBST(COMMONAPI_API_HEADER_VERSION) +AC_ARG_WITH([loose-version-check], [AS_HELP_STRING([--with-loose-version-check], [if loose-version-check is set the CommonAPI will only be checked for major and minor version])], + [LOOSE_VERSION_CHECK=1], []) + AS_IF([test -z "${CXXFLAGS}"], [CXXFLAGS='-O0'], []) AC_PROG_CXX @@ -34,9 +37,15 @@ AC_ARG_VAR([GTEST_CONFIG], [The exact path of Google Test's 'gtest-config' scrip LT_PREREQ(2.2) LT_INIT - PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(COMMONAPI, [CommonAPI = 2.1.6]) +AS_IF([test ${LOOSE_VERSION_CHECK} = 1], + [ + PKG_CHECK_MODULES(COMMONAPI, [CommonAPI >= 2.1 CommonAPI < 2.2]) + ], + [ + PKG_CHECK_MODULES(COMMONAPI, [CommonAPI = 2.1.6]) + ] +) PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.4.6]) PKG_CHECK_MODULES(GLIB, [glib-2.0], [], @@ -72,6 +81,17 @@ AS_IF([test -f "${GTEST_CONFIG}"], [] ) +AS_IF([${TESTS_CAN_BE_EXECUTED}], + [], + [[GTEST_CPPFLAGS=""] + [GTEST_CXXFLAGS=""] + [GTEST_LDFLAGS=""] + [GTEST_LIBS=""] + [GTEST_VERSION=""] + [GTEST_ERROR=" + WARNING: No glib found, tests will not be compiled! Please install the glib package! + "]]) + AM_CONDITIONAL(ENABLE_TESTS, [test -f "${GTEST_CONFIG}" && ${TESTS_CAN_BE_EXECUTED}]) # Doxygen support @@ -87,7 +107,7 @@ DX_INIT_DOXYGEN(${PACKAGE_NAME}, doxygen.cfg, doc) AC_MSG_RESULT([ $PACKAGE_NAME v$VERSION - + ${GTEST_ERROR} enable docs: ${ENABLE_DOCS} COMMONAPI_CFLAGS: ${COMMONAPI_CFLAGS} |