Commit 48c9e905 authored by Karel Slaný's avatar Karel Slaný

Fixed configuration when linking dynamically.

Dynamically linked fat libraries on OS X don't work now.
parent 1b229511
......@@ -395,6 +395,11 @@ AS_IF([test "x$enable_static_linking" = "xyes"], [
], [
AC_MSG_RESULT([no]) # Dynamic linking.
AM_CONDITIONAL([BUILD_32], [test "x${BITS}" = "x32"])
AM_CONDITIONAL([BUILD_64], [test "x${BITS}" = "x64"])
AM_CONDITIONAL([BUILD_FAT], [false])
AM_CONDITIONAL([BUILD_FAT_OSX], [false])
# OpenSSL
CPPFLAGS="$PASSED_CPPFLAGS"
CFLAGS="$PASSED_CFLAGS"; CXXFLAGS="$PASSED_CXXFLAGS";
......@@ -450,6 +455,21 @@ AS_IF([test "x$enable_static_linking" = "xyes"], [
CORE_LDFLAGS="${CORE_LDFLAGS} $LDFLAGS"
CORE_LIBS="${CORE_LIBS} $LIBS"
CORE_CFLAGS_32="${CORE_CFLAGS}"
CORE_CFLAGS_64="${CORE_CFLAGS}"
CORE_OBJCFLAGS_32="${CORE_OBJCFLAGS}"
CORE_OBJCFLAGS_64="${CORE_OBJCFLAGS}"
CORE_LDFLAGS_32="${CORE_LDFLAGS}"
CORE_LDFLAGS_64="${CORE_LDFLAGS}"
AC_SUBST(CORE_CPPFLAGS_32)
AC_SUBST(CORE_CPPFLAGS_64)
AC_SUBST(CORE_CFLAGS_32)
AC_SUBST(CORE_CFLAGS_64)
AC_SUBST(CORE_OBJCFLAGS_32)
AC_SUBST(CORE_OBJCFLAGS_64)
AC_SUBST(CORE_LDFLAGS_32)
AC_SUBST(CORE_LDFLAGS_64)
# Checks whether libldns knows LDNS_RR_TYPE_TLSA
AC_MSG_CHECKING([whether libldns knows LDNS_RR_TYPE_TLSA])
cat>conftest.c<<EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment