diff --git a/build-aux/m4/buildsys.m4 b/build-aux/m4/buildsys.m4 index d9a752b..93cfd62 100644 --- a/build-aux/m4/buildsys.m4 +++ b/build-aux/m4/buildsys.m4 @@ -144,6 +144,7 @@ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ AC_DEFUN([BUILDSYS_SHARED_LIB], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(for shared library system) + case "$host_os" in darwin*) AC_MSG_RESULT(Darwin) @@ -283,7 +284,6 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [ AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME) $1 - ;; esac ]) diff --git a/buildsys.mk.in b/buildsys.mk.in index d93e4af..7e94a9a 100644 --- a/buildsys.mk.in +++ b/buildsys.mk.in @@ -277,7 +277,7 @@ ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} fi ${LINK_STATUS} out="$@"; \ - if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \ + if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \ ${LINK_OK}; \ else \ rm -fr $$out; \ diff --git a/configure.ac b/configure.ac index 90f7869..2a27959 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,8 @@ CPP="$OBJCPP" CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)" LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)" -LIBS="$LIBS $($OBJFW_CONFIG --libs)" +AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)") +AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)") AX_CHECK_COMPILER_FLAGS(-Wdocumentation, [OBJCFLAGS="$OBJCFLAGS -Wdocumentation"]) diff --git a/extra.mk.in b/extra.mk.in index afc0b6f..d547fe0 100644 --- a/extra.mk.in +++ b/extra.mk.in @@ -1,3 +1,6 @@ OBJOPENSSL_SHARED_LIB = @OBJOPENSSL_SHARED_LIB@ OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@ OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@ + +OBJFW_LIBS = @OBJFW_LIBS@ +OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@ diff --git a/src/Makefile b/src/Makefile index f38d3f4..bca31ba 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,3 +17,5 @@ INCLUDES = ${SRCS:.m=.h} \ include ../buildsys.mk LD = ${OBJC} +FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS} +LIBS := ${OBJFW_LIBS} ${LIBS}