diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-01-30 10:24:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-08-26 07:50:53 +0000 |
| commit | d2db6ecd9994210e75fb4362d781ec882ec7238a (patch) | |
| tree | de0a6af582218030dcae43ed1a6911756f7527d1 /configure.ac | |
| parent | 188c2613b3744345e2ba3d4cfd0bcc47b12b74ae (diff) | |
Split the "selfcontained" configure option in twoHEADQtCreator4.15.1QtCreator4.15.0-rc1QtCreator4.15.0-beta2QtCreator4.15.0-beta1QtCreator4.15.0QtCreator4.14.2QtCreator4.14.1QtCreator4.14.0-rc1QtCreator4.14.0-beta2QtCreator4.14.0-beta1QtCreator4.14.0QtCreator4.13.3QtCreator4.13.2QtCreator4.13.1QtCreator4.13.0-rc1QtCreator4.13.0-beta2QtCreator4.13.0-beta1QtCreator4.13.0QtCreator4.12.4QtCreator4.12.3QtCreator4.12.2QtCreator4.12.1QtCreator4.12.0-rc1QtCreator4.12.0-beta2QtCreator4.12.0-beta1QtCreator4.12.0QtCreator4.11.2QtCreator4.11.0-rc1QtCreator4.11.0-beta2QtCreator4.11.0-beta1QtCreator4.11.0master5.04.154.144.134.124.1112.011.010.0
upstream is growing an option to install elf.h. We want to use that.
Change-Id: Ica5bf0cdf281eb17ef29e0e1029662a5a9d875b1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b351f086..eddacb8b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,11 +125,11 @@ AS_HELP_STRING([--enable-gnulib], use_gnulib=$enableval, use_gnulib=no) AM_CONDITIONAL(USE_GNULIB, test "$use_gnulib" = yes) -AC_ARG_ENABLE([selfcontained], -AS_HELP_STRING([--enable-selfcontained], - [install extra headers to enable including and linking the libraries on non-GNU systems]), - selfcontained=$enableval, selfcontained=no) -AM_CONDITIONAL(SELFCONTAINED, test "$selfcontained" = yes) +AC_ARG_ENABLE([install-featuresh], +AS_HELP_STRING([--enable-install-featuresh], + [install a dummy features.h header]), + install_featuresh=$enableval, install_featuresh=no) +AM_CONDITIONAL(INSTALL_FEATURESH, test "$install_featuresh" = yes) AC_PROG_CC @@ -389,6 +389,11 @@ if test "$use_valgrind" = yes; then fi AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes) +AC_ARG_ENABLE([install-elfh], +AS_HELP_STRING([--enable-install-elfh],[install elf.h in include dir]), + [install_elfh=$enableval], [install_elfh=no]) +AM_CONDITIONAL(INSTALL_ELFH, test "$install_elfh" = yes) + AM_CONDITIONAL(BUILD_STATIC, [dnl test "$use_gprof" = yes -o "$use_gcov" = yes]) @@ -811,6 +816,7 @@ AC_MSG_NOTICE([ NOT RECOMMENDED FEATURES (should all be no) Experimental thread safety : ${use_locks} + install elf.h : ${install_elfh} OTHER FEATURES Deterministic archives by default : ${default_ar_deterministic} @@ -826,3 +832,9 @@ AC_MSG_NOTICE([ use rpath in tests : ${tests_use_rpath} test biarch : ${utrace_cv_cc_biarch} ]) + +if test "$install_elfh" = yes; then + if test "${prefix}" = "/usr/local" -o "${prefix}" = "/usr"; then + AC_MSG_WARN([installing elf.h in ${includedir} might conflict with glibc/system elf.h]) + fi +fi |