diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-10-01 18:10:15 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-10-01 18:10:15 +0200 |
| commit | e4368d29209fbe6aef22c6b78f52882631a13daf (patch) | |
| tree | 1c10307e354788e2ab08725d6be4d1043a9994fb /configure.ac | |
| parent | [master] Merged trac4061 (use isc::asiolink::IOAddress predicates) (diff) | |
| parent | [4004] Put again hooks.h as a dependency (diff) | |
| download | kea-e4368d29209fbe6aef22c6b78f52882631a13daf.tar.xz kea-e4368d29209fbe6aef22c6b78f52882631a13daf.zip | |
[master] Merged trac4004 (enable-static and unit tests)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 702fee0a76..9dbd0eedc0 100644 --- a/configure.ac +++ b/configure.ac @@ -241,13 +241,11 @@ AM_COND_IF([USE_STATIC_LINK], [AC_DEFINE([USE_STATIC_LINK], [1], [Was Kea static if test $enable_static_link = yes -a $enable_static = no; then AC_MSG_ERROR([--enable-static-link requires --enable-static]) fi -if test $enable_shared = no; then - AC_MSG_ERROR([Kea requires shared libraries to be built]) +if test $enable_static_link = no -a $enable_shared = no; then + AC_MSG_ERROR([--disable-static-link requires --enable-shared]) fi # OS dependent configuration -SET_ENV_LIBRARY_PATH=no -ENV_LIBRARY_PATH=LD_LIBRARY_PATH kea_undefined_pthread_behavior=no case "$host" in @@ -281,15 +279,6 @@ case "$host" in [AC_MSG_RESULT([OS X < 10.9])], [AC_MSG_RESULT([OS X >= 10.9]) kea_undefined_pthread_behavior=yes]) - - # libtool doesn't work perfectly with Darwin: libtool embeds the - # final install path in dynamic libraries and our loadable python - # modules always refer to that path even if it's loaded within the - # source tree. This prevents pre-install tests from working. - # To work around this problem we explicitly specify paths to dynamic - # libraries when we use them in the source tree. - SET_ENV_LIBRARY_PATH=yes - ENV_LIBRARY_PATH=DYLD_LIBRARY_PATH ;; *-freebsd*) # On FreeBSD10.1 pthread_cond_destroy doesn't work as documented, which @@ -302,19 +291,8 @@ case "$host" in # didn't seem to have support for the death tests on FreeBSD. As a # result, the test was not executed and the error didn't occur. kea_undefined_pthread_behavior=yes - - SET_ENV_LIBRARY_PATH=yes - ;; -*-netbsd*) - SET_ENV_LIBRARY_PATH=yes - ;; -*-openbsd*) - SET_ENV_LIBRARY_PATH=yes ;; esac -AM_CONDITIONAL(SET_ENV_LIBRARY_PATH, test $SET_ENV_LIBRARY_PATH = yes) -AC_SUBST(SET_ENV_LIBRARY_PATH) -AC_SUBST(ENV_LIBRARY_PATH) if [ test $kea_undefined_pthread_behavior = "yes" ]; then AC_DEFINE([HAS_UNDEFINED_PTHREAD_BEHAVIOR], [1], [Does this platform have some undefined pthreads behavior?]) fi |