From d840bbb9be1db8c66ffca898efd5ed7a30260df2 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 18 Sep 2015 20:21:04 +0200 Subject: [4004] Got rid of *ENV_LIBRARY_PATH --- configure.ac | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 00751c7338..130ede10c0 100644 --- a/configure.ac +++ b/configure.ac @@ -246,8 +246,6 @@ if test $enable_shared = no; then 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 -- cgit v1.2.3 From 8837571d29b276211d757ad7b9fc59b5bf78621a Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 19 Sep 2015 13:25:24 +0200 Subject: [4004] Allowed --disable-shared --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 130ede10c0..70b645ab48 100644 --- a/configure.ac +++ b/configure.ac @@ -241,8 +241,8 @@ 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 -- cgit v1.2.3