Update buildsys

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
 ])

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; \

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"])

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@

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}