summaryrefslogtreecommitdiff
path: root/infrastructure/m4
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2012-04-28 18:07:42 +0000
committerChris Wilson <chris+github@qwirx.com>2012-04-28 18:07:42 +0000
commit83d7c9689efe3933c74e4d4fbee026d3d4de4676 (patch)
treea8f6b081927863ed84e87f68a66cfbdd3b69d4d7 /infrastructure/m4
parent4d26fe1b213426684dc312cf35e6c9bb83c430cf (diff)
Move libdl tests before boxbackup tests in configure.ac to fix OpenSSL link errors.
Diffstat (limited to 'infrastructure/m4')
-rw-r--r--infrastructure/m4/boxbackup_tests.m47
1 files changed, 4 insertions, 3 deletions
diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4
index c745b4be..1bdd497d 100644
--- a/infrastructure/m4/boxbackup_tests.m4
+++ b/infrastructure/m4/boxbackup_tests.m4
@@ -97,6 +97,10 @@ AX_PATH_BDB([1.x or 4.1], [
AX_SPLIT_VERSION([BDB_VERSION], [$BDB_VERSION])
])
+# need to find libdl before trying to link openssl, apparently
+AC_SEARCH_LIBS([dlsym], ["dl"])
+AC_CHECK_FUNCS([dlsym dladdr])
+
## Check for Open SSL, use old versions only if explicitly requested
AC_SEARCH_LIBS([gethostbyname], [nsl socket resolv])
AC_SEARCH_LIBS([shutdown], [nsl socket resolv])
@@ -167,9 +171,6 @@ else
have_regex_support=no
fi
-AC_SEARCH_LIBS([dlsym], ["dl"])
-AC_CHECK_FUNCS([dlsym dladdr])
-
### Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t, u_int64_t])